mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 00:13:21 +01:00
5f7082f053
- fixes #14398 I will properly fill out this PR and fix any tests that might break when I have the time, this was a quick fix. # Description This PR makes `from csv` and `from tsv`, with the `--flexible` flag, stop dropping extra/unexpected columns. # User-Facing Changes `$text`'s contents ```csv value 1,aaa 2,bbb 3 4,ddd 5,eee,extra ``` Old behavior ```nushell > $text | from csv --flexible --noheaders ╭─#─┬─column0─╮ │ 0 │ value │ │ 1 │ 1 │ │ 2 │ 2 │ │ 3 │ 3 │ │ 4 │ 4 │ │ 5 │ 5 │ ╰─#─┴─column0─╯ ``` New behavior ```nushell > $text | from csv --flexible --noheaders ╭─#─┬─column0─┬─column1─┬─column2─╮ │ 0 │ value │ ❎ │ ❎ │ │ 1 │ 1 │ aaa │ ❎ │ │ 2 │ 2 │ bbb │ ❎ │ │ 3 │ 3 │ ❎ │ ❎ │ │ 4 │ 4 │ ddd │ ❎ │ │ 5 │ 5 │ eee │ extra │ ╰─#─┴─column0─┴─column1─┴─column2─╯ ``` - The first line in a csv (or tsv) document no longer limits the number of columns - Missing values in columns are longer automatically filled with `null` with this change, as a later row can introduce new columns. **BREAKING CHANGE** Because missing columns are different from empty columns, operations on possibly missing columns will have to use optional access syntax e.g. `get foo` => `get foo?` # Tests + Formatting Added examples that run as tests and adjusted existing tests to confirm the new behavior. # After Submitting Update the workaround with fish completer mentioned [here](https://www.nushell.sh/cookbook/external_completers.html#fish-completer)
484 lines
12 KiB
Rust
484 lines
12 KiB
Rust
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
|
||
use nu_test_support::playground::Playground;
|
||
use nu_test_support::{nu, pipeline};
|
||
|
||
#[test]
|
||
fn table_to_csv_text_and_from_csv_text_back_into_table() {
|
||
let actual = nu!(
|
||
cwd: "tests/fixtures/formats",
|
||
"open caco3_plastics.csv | to csv | from csv | first | get origin "
|
||
);
|
||
|
||
assert_eq!(actual.out, "SPAIN");
|
||
}
|
||
|
||
#[test]
|
||
fn table_to_csv_text() {
|
||
Playground::setup("filter_to_csv_test_1", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"csv_text_sample.txt",
|
||
r#"
|
||
importer,shipper,tariff_item,name,origin
|
||
Plasticos Rival,Reverte,2509000000,Calcium carbonate,Spain
|
||
Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open csv_text_sample.txt
|
||
| lines
|
||
| str trim
|
||
| split column "," a b c d origin
|
||
| last 1
|
||
| to csv
|
||
| lines
|
||
| get 1
|
||
"#
|
||
));
|
||
|
||
assert!(actual
|
||
.out
|
||
.contains("Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia"));
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn table_to_csv_text_skipping_headers_after_conversion() {
|
||
Playground::setup("filter_to_csv_test_2", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"csv_text_sample.txt",
|
||
r#"
|
||
importer,shipper,tariff_item,name,origin
|
||
Plasticos Rival,Reverte,2509000000,Calcium carbonate,Spain
|
||
Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open csv_text_sample.txt
|
||
| lines
|
||
| str trim
|
||
| split column "," a b c d origin
|
||
| last 1
|
||
| to csv --noheaders
|
||
"#
|
||
));
|
||
|
||
assert!(actual
|
||
.out
|
||
.contains("Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia"));
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn infers_types() {
|
||
Playground::setup("filter_from_csv_test_1", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_cuatro_mosqueteros.csv",
|
||
r#"
|
||
first_name,last_name,rusty_luck,d
|
||
Andrés,Robalino,1,d
|
||
JT,Turner,1,d
|
||
Yehuda,Katz,1,d
|
||
Jason,Gedge,1,d
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_cuatro_mosqueteros.csv
|
||
| where rusty_luck > 0
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "4");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_to_table() {
|
||
Playground::setup("filter_from_csv_test_2", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
Andrés,Robalino,1
|
||
JT,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv
|
||
| get rusty_luck
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_separator_to_table() {
|
||
Playground::setup("filter_from_csv_test_3", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name;last_name;rusty_luck
|
||
Andrés;Robalino;1
|
||
JT;Turner;1
|
||
Yehuda;Katz;1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator ";"
|
||
| get rusty_luck
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_tab_separator_to_table() {
|
||
Playground::setup("filter_from_csv_test_4", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name last_name rusty_luck
|
||
Andrés Robalino 1
|
||
JT Turner 1
|
||
Yehuda Katz 1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator (char tab)
|
||
| get rusty_luck
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
#[ignore = "csv crate has a bug when the last line is a comment: https://github.com/BurntSushi/rust-csv/issues/363"]
|
||
fn from_csv_text_with_comments_to_table() {
|
||
Playground::setup("filter_from_csv_test_5", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
# This is a comment
|
||
first_name,last_name,rusty_luck
|
||
# This one too
|
||
Andrés,Robalino,1
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
# This one also
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r##"
|
||
open los_tres_caballeros.txt
|
||
| from csv --comment "#"
|
||
| get rusty_luck
|
||
| length
|
||
"##
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_custom_quotes_to_table() {
|
||
Playground::setup("filter_from_csv_test_6", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
'And''rés',Robalino,1
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --quote "'"
|
||
| first
|
||
| get first_name
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "And'rés");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_custom_escapes_to_table() {
|
||
Playground::setup("filter_from_csv_test_7", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
"And\"rés",Robalino,1
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r"
|
||
open los_tres_caballeros.txt
|
||
| from csv --escape '\'
|
||
| first
|
||
| get first_name
|
||
"
|
||
));
|
||
|
||
assert_eq!(actual.out, "And\"rés");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_skipping_headers_to_table() {
|
||
Playground::setup("filter_from_csv_test_8", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_amigos.txt",
|
||
r#"
|
||
Andrés,Robalino,1
|
||
JT,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_amigos.txt
|
||
| from csv --noheaders
|
||
| get column2
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_missing_columns_to_table() {
|
||
Playground::setup("filter_from_csv_test_9", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
Andrés,Robalino
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --flexible
|
||
| get -i rusty_luck
|
||
| compact
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "2");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_multiple_char_separator() {
|
||
Playground::setup("filter_from_csv_test_10", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
Andrés,Robalino,1
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator "li"
|
||
"#
|
||
));
|
||
|
||
assert!(actual
|
||
.err
|
||
.contains("separator should be a single char or a 4-byte unicode"));
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_text_with_wrong_type_separator() {
|
||
Playground::setup("filter_from_csv_test_11", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name,last_name,rusty_luck
|
||
Andrés,Robalino,1
|
||
Jonathan,Turner,1
|
||
Yehuda,Katz,1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator ('123' | into int)
|
||
"#
|
||
));
|
||
|
||
assert!(actual.err.contains("can't convert int to string"));
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn table_with_record_error() {
|
||
let actual = nu!(pipeline(
|
||
r#"
|
||
[[a b]; [1 2] [3 {a: 1 b: 2}]]
|
||
| to csv
|
||
"#
|
||
));
|
||
|
||
assert!(actual.err.contains("can't convert"))
|
||
}
|
||
|
||
#[test]
|
||
fn list_not_table_error() {
|
||
let actual = nu!(pipeline(
|
||
r#"
|
||
[{a: 1 b: 2} {a: 3 b: 4} 1]
|
||
| to csv
|
||
"#
|
||
));
|
||
|
||
assert!(actual.err.contains("can't convert"))
|
||
}
|
||
|
||
#[test]
|
||
fn string_to_csv_error() {
|
||
let actual = nu!(pipeline(
|
||
r#"
|
||
'qwe' | to csv
|
||
"#
|
||
));
|
||
|
||
assert!(actual.err.contains("command doesn't support"))
|
||
}
|
||
|
||
#[test]
|
||
fn parses_csv_with_unicode_sep() {
|
||
Playground::setup("filter_from_csv_unicode_sep_test_3", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_name;last_name;rusty_luck
|
||
Andrés;Robalino;1
|
||
JT;Turner;1
|
||
Yehuda;Katz;1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator "003B"
|
||
| get rusty_luck
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn parses_csv_with_unicode_x1f_sep() {
|
||
Playground::setup("filter_from_csv_unicode_sep_x1f_test_3", |dirs, sandbox| {
|
||
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
||
"los_tres_caballeros.txt",
|
||
r#"
|
||
first_namelast_namerusty_luck
|
||
AndrésRobalino1
|
||
JTTurner1
|
||
YehudaKatz1
|
||
"#,
|
||
)]);
|
||
|
||
let actual = nu!(
|
||
cwd: dirs.test(), pipeline(
|
||
r#"
|
||
open los_tres_caballeros.txt
|
||
| from csv --separator "001F"
|
||
| get rusty_luck
|
||
| length
|
||
"#
|
||
));
|
||
|
||
assert_eq!(actual.out, "3");
|
||
})
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_test_flexible_extra_vals() {
|
||
let actual = nu!(pipeline(
|
||
r#"
|
||
echo "a,b\n1,2,3" | from csv --flexible | first | values | to nuon
|
||
"#
|
||
));
|
||
assert_eq!(actual.out, "[1, 2, 3]");
|
||
}
|
||
|
||
#[test]
|
||
fn from_csv_test_flexible_missing_vals() {
|
||
let actual = nu!(pipeline(
|
||
r#"
|
||
echo "a,b\n1" | from csv --flexible | first | values | to nuon
|
||
"#
|
||
));
|
||
assert_eq!(actual.out, "[1]");
|
||
}
|