extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-26 10:23:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: change column names from 'Column*' to 'column*' (#4556)

Browse Source
This commit is contained in:
Justin Ma 2022-02-20 08:26:47 +08:00 committed by GitHub
parent a6c565ed4e
commit aea4355d04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-command/src/filters/headers.rs
View File

@ -119,7 +119,7 @@ fn extract_headers(value: &Value, config: &Config) -> Result<Vec<String>, ShellE
.map(|(idx, value)| { .map(|(idx, value)| {
let col = value.into_string("", config); let col = value.into_string("", config);
if col.is_empty() { if col.is_empty() {
format!("Column{}", idx) format!("column{}", idx)
} else { } else {
col col
} }

44
crates/nu-command/src/filters/rotate.rs
View File

@ -37,12 +37,12 @@ impl Command for Rotate {
result: Some(Value::List { result: Some(Value::List {
vals: vec![ vals: vec![
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_int(1), Value::test_string("a")], vals: vec![Value::test_int(1), Value::test_string("a")],
span: Span::test_data(), span: Span::test_data(),
}, },
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_int(2), Value::test_string("b")], vals: vec![Value::test_int(2), Value::test_string("b")],
span: Span::test_data(), span: Span::test_data(),
}, },
@ -57,10 +57,10 @@ impl Command for Rotate {
vals: vec![ vals: vec![
Value::Record { Value::Record {
cols: vec![ cols: vec![
"Column0".to_string(), "column0".to_string(),
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_int(5), Value::test_int(5),
@ -72,10 +72,10 @@ impl Command for Rotate {
}, },
Value::Record { Value::Record {
cols: vec![ cols: vec![
"Column0".to_string(), "column0".to_string(),
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_int(6), Value::test_int(6),
@ -114,12 +114,12 @@ impl Command for Rotate {
result: Some(Value::List { result: Some(Value::List {
vals: vec![ vals: vec![
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_string("b"), Value::test_int(2)], vals: vec![Value::test_string("b"), Value::test_int(2)],
span: Span::test_data(), span: Span::test_data(),
}, },
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_string("a"), Value::test_int(1)], vals: vec![Value::test_string("a"), Value::test_int(1)],
span: Span::test_data(), span: Span::test_data(),
}, },
@ -134,10 +134,10 @@ impl Command for Rotate {
vals: vec![ vals: vec![
Value::Record { Value::Record {
cols: vec![ cols: vec![
"Column0".to_string(), "column0".to_string(),
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_string("b"), Value::test_string("b"),
@ -149,10 +149,10 @@ impl Command for Rotate {
}, },
Value::Record { Value::Record {
cols: vec![ cols: vec![
"Column0".to_string(), "column0".to_string(),
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_string("a"), Value::test_string("a"),
@ -260,11 +260,11 @@ pub fn rotate(
*total_rows -= 1; *total_rows -= 1;
} }
// holder for the new column names, particularly if none are provided by the user we create names as Column0, Column1, etc. // holder for the new column names, particularly if none are provided by the user we create names as column0, column1, etc.
let mut new_column_names = { let mut new_column_names = {
let mut res = vec![]; let mut res = vec![];
for idx in 0..(*total_rows + 1) { for idx in 0..(*total_rows + 1) {
res.push(format!("Column{}", idx)); res.push(format!("column{}", idx));
} }
res.to_vec() res.to_vec()
}; };

6
crates/nu-command/src/filters/transpose.rs
View File

@ -63,12 +63,12 @@ impl Command for Transpose {
result: Some(Value::List { result: Some(Value::List {
vals: vec![ vals: vec![
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_string("c1"), Value::test_int(1)], vals: vec![Value::test_string("c1"), Value::test_int(1)],
span, span,
}, },
Value::Record { Value::Record {
cols: vec!["Column0".to_string(), "Column1".to_string()], cols: vec!["column0".to_string(), "column1".to_string()],
vals: vec![Value::test_string("c2"), Value::test_int(2)], vals: vec![Value::test_string("c2"), Value::test_int(2)],
span, span,
}, },
@ -184,7 +184,7 @@ pub fn transpose(
if let Some(name) = args.rest.get(i) { if let Some(name) = args.rest.get(i) {
headers.push(name.item.clone()) headers.push(name.item.clone())
} else { } else {
headers.push(format!("Column{}", i)); headers.push(format!("column{}", i));
} }
} }
} }

2
crates/nu-command/src/formats/from/delimited.rs
View File

@ -14,7 +14,7 @@ fn from_delimited_string_to_value(
let headers = if noheaders { let headers = if noheaders {
(1..=reader.headers()?.len()) (1..=reader.headers()?.len())
.map(|i| format!("Column{}", i)) .map(|i| format!("column{}", i))
.collect::<Vec<String>>() .collect::<Vec<String>>()
} else { } else {
reader.headers()?.iter().map(String::from).collect() reader.headers()?.iter().map(String::from).collect()

2
crates/nu-command/src/formats/from/ods.rs
View File

@ -146,7 +146,7 @@ fn from_ods(
_ => Value::nothing(head), _ => Value::nothing(head),
}; };
row_output.insert(format!("Column{}", i), value); row_output.insert(format!("column{}", i), value);
} }
let (cols, vals) = let (cols, vals) =

42
crates/nu-command/src/formats/from/ssv.rs
View File

@ -49,7 +49,7 @@ impl Command for FromSsv {
1 2' | from ssv -n"#, 1 2' | from ssv -n"#,
description: "Converts ssv formatted string to table but not treating the first row as column names", description: "Converts ssv formatted string to table but not treating the first row as column names",
result: Some( result: Some(
Value::List { vals: vec![Value::Record { cols: vec!["Column1".to_string(), "Column2".to_string()], vals: vec![Value::String { val: "FOO".to_string(), span: Span::test_data() }, Value::String { val: "BAR".to_string(), span: Span::test_data() }], span: Span::test_data() }, Value::Record { cols: vec!["Column1".to_string(), "Column2".to_string()], vals: vec![Value::String { val: "1".to_string(), span: Span::test_data() }, Value::String { val: "2".to_string(), span: Span::test_data() }], span: Span::test_data() }], span: Span::test_data() }), Value::List { vals: vec![Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::String { val: "FOO".to_string(), span: Span::test_data() }, Value::String { val: "BAR".to_string(), span: Span::test_data() }], span: Span::test_data() }, Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::String { val: "1".to_string(), span: Span::test_data() }, Value::String { val: "2".to_string(), span: Span::test_data() }], span: Span::test_data() }], span: Span::test_data() }),
}] }]
} }
@ -150,7 +150,7 @@ fn parse_aligned_columns<'a>(
let headers: Vec<(String, usize)> = indices let headers: Vec<(String, usize)> = indices
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, position)| (format!("Column{}", i + 1), *position)) .map(|(i, position)| (format!("column{}", i + 1), *position))
.collect(); .collect();
construct(ls.iter().map(|s| s.to_owned()), headers) construct(ls.iter().map(|s| s.to_owned()), headers)
@ -196,7 +196,7 @@ fn parse_separated_columns<'a>(
let num_columns = ls.iter().map(|r| r.len()).max().unwrap_or(0); let num_columns = ls.iter().map(|r| r.len()).max().unwrap_or(0);
let headers = (1..=num_columns) let headers = (1..=num_columns)
.map(|i| format!("Column{}", i)) .map(|i| format!("column{}", i))
.collect::<Vec<String>>(); .collect::<Vec<String>>();
collect(headers, ls.into_iter(), separator) collect(headers, ls.into_iter(), separator)
}; };
@ -337,9 +337,9 @@ mod tests {
assert_eq!( assert_eq!(
result, result,
vec![ vec![
vec![owned("Column1", "a"), owned("Column2", "b")], vec![owned("column1", "a"), owned("column2", "b")],
vec![owned("Column1", "1"), owned("Column2", "2")], vec![owned("column1", "1"), owned("column2", "2")],
vec![owned("Column1", "3"), owned("Column2", "4")] vec![owned("column1", "3"), owned("column2", "4")]
] ]
); );
} }
@ -451,25 +451,25 @@ mod tests {
result, result,
vec![ vec![
vec![ vec![
owned("Column1", "a multi-word value"), owned("column1", "a multi-word value"),
owned("Column2", "b"), owned("column2", "b"),
owned("Column3", ""), owned("column3", ""),
owned("Column4", "d"), owned("column4", "d"),
owned("Column5", "") owned("column5", "")
], ],
vec![ vec![
owned("Column1", "1"), owned("column1", "1"),
owned("Column2", ""), owned("column2", ""),
owned("Column3", "3-3"), owned("column3", "3-3"),
owned("Column4", "4"), owned("column4", "4"),
owned("Column5", "") owned("column5", "")
], ],
vec![ vec![
owned("Column1", ""), owned("column1", ""),
owned("Column2", ""), owned("column2", ""),
owned("Column3", ""), owned("column3", ""),
owned("Column4", ""), owned("column4", ""),
owned("Column5", "last") owned("column5", "last")
], ],
] ]
); );

2
crates/nu-command/src/formats/from/xlsx.rs
View File

@ -146,7 +146,7 @@ fn from_xlsx(
_ => Value::nothing(head), _ => Value::nothing(head),
}; };
row_output.insert(format!("Column{}", i), value); row_output.insert(format!("column{}", i), value);
} }
let (cols, vals) = let (cols, vals) =

8
crates/nu-command/src/strings/detect_columns.rs
View File

@ -54,9 +54,9 @@ impl Command for DetectColumns {
result: Some(Value::List { result: Some(Value::List {
vals: vec![Value::Record { vals: vec![Value::Record {
cols: vec![ cols: vec![
"Column0".to_string(), "column0".to_string(),
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_string("a"), Value::test_string("a"),
@ -105,7 +105,7 @@ fn detect_columns(
if noheader { if noheader {
for header in headers.iter_mut().enumerate() { for header in headers.iter_mut().enumerate() {
header.1.item = format!("Column{}", header.0); header.1.item = format!("column{}", header.0);
} }
} }

14
crates/nu-command/src/strings/split/column.rs
View File

@ -51,9 +51,9 @@ impl Command for SubCommand {
result: Some(Value::List { result: Some(Value::List {
vals: vec![Value::Record { vals: vec![Value::Record {
cols: vec![ cols: vec![
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_string("a"), Value::test_string("a"),
@ -71,9 +71,9 @@ impl Command for SubCommand {
result: Some(Value::List { result: Some(Value::List {
vals: vec![Value::Record { vals: vec![Value::Record {
cols: vec![ cols: vec![
"Column1".to_string(), "column1".to_string(),
"Column2".to_string(), "column2".to_string(),
"Column3".to_string(), "column3".to_string(),
], ],
vals: vec![ vals: vec![
Value::test_string("a"), Value::test_string("a"),
@ -131,7 +131,7 @@ fn split_column_helper(
if positional.is_empty() { if positional.is_empty() {
let mut gen_columns = vec![]; let mut gen_columns = vec![];
for i in 0..split_result.len() { for i in 0..split_result.len() {
gen_columns.push(format!("Column{}", i + 1)); gen_columns.push(format!("column{}", i + 1));
} }
for (&k, v) in split_result.iter().zip(&gen_columns) { for (&k, v) in split_result.iter().zip(&gen_columns) {

2
crates/nu-command/tests/commands/headers.rs
View File

@ -23,7 +23,7 @@ fn headers_adds_missing_column_name() {
open sample_headers.xlsx open sample_headers.xlsx
| get Sheet1 | get Sheet1
| headers | headers
| get Column1 | get column1
| to json --raw"# | to json --raw"#
)); ));

2
crates/nu-command/tests/commands/lines.rs
View File

@ -11,7 +11,7 @@ fn lines() {
| skip 1 | skip 1
| first 1 | first 1
| split column "=" | split column "="
| get Column1.0 | get column1.0
| str trim | str trim
"# "#
)); ));

2
crates/nu-command/tests/commands/path/parse.rs
View File

@ -122,7 +122,7 @@ fn parses_into_correct_number_of_columns() {
echo 'home/viking/spam.txt' echo 'home/viking/spam.txt'
| path parse | path parse
| transpose | transpose
| get Column0 | get column0
| length | length
"# "#
)); ));

2
crates/nu-command/tests/commands/roll.rs
View File

@ -122,7 +122,7 @@ mod columns {
// //
// output: // output:
// [ // [
// [Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8]; // [column1, column2, column3, column4, column5, column6, column7, column8];
// [ 0, 0, 0, 0, 0, 1, 0, 0] // [ 0, 0, 0, 0, 0, 1, 0, 0]
// ] // ]
// //

20
crates/nu-command/tests/commands/rotate.rs
View File

@ -17,14 +17,14 @@ fn counter_clockwise() {
let expected = nu!(cwd: ".", pipeline( let expected = nu!(cwd: ".", pipeline(
r#" r#"
echo [ echo [
[ Column0, Column1, Column2, Column3]; [ column0, column1, column2, column3];
[ EXPECTED, XX1, XX2, XX3] [ EXPECTED, XX1, XX2, XX3]
[ col2, "|||", "|||", "|||"] [ col2, "|||", "|||", "|||"]
[ col1, ---, ---, ---] [ col1, ---, ---, ---]
] ]
| where Column0 == EXPECTED | where column0 == EXPECTED
| get Column1 Column2 Column3 | get column1 column2 column3
| str collect "-" | str collect "-"
"#, "#,
)); ));
@ -33,8 +33,8 @@ fn counter_clockwise() {
cwd: ".", cwd: ".",
format!("{} | {}", table, pipeline(r#" format!("{} | {}", table, pipeline(r#"
rotate --ccw rotate --ccw
| where Column0 == EXPECTED | where column0 == EXPECTED
| get Column1 Column2 Column3 | get column1 column2 column3
| str collect "-" | str collect "-"
"#))); "#)));
@ -58,14 +58,14 @@ fn clockwise() {
let expected = nu!(cwd: ".", pipeline( let expected = nu!(cwd: ".", pipeline(
r#" r#"
echo [ echo [
[ Column0, Column1, Column2, Column3]; [ column0, column1, column2, column3];
[ ---, ---, ---, col1] [ ---, ---, ---, col1]
[ "|||", "|||", "|||", col2] [ "|||", "|||", "|||", col2]
[ XX3, XX2, XX1, EXPECTED] [ XX3, XX2, XX1, EXPECTED]
] ]
| where Column3 == EXPECTED | where column3 == EXPECTED
| get Column0 Column1 Column2 | get column0 column1 column2
| str collect "-" | str collect "-"
"#, "#,
)); ));
@ -74,8 +74,8 @@ fn clockwise() {
cwd: ".", cwd: ".",
format!("{} | {}", table, pipeline(r#" format!("{} | {}", table, pipeline(r#"
rotate rotate
| where Column3 == EXPECTED | where column3 == EXPECTED
| get Column0 Column1 Column2 | get column0 column1 column2
| str collect "-" | str collect "-"
"#))); "#)));

6
crates/nu-command/tests/commands/sort_by.rs
View File

@ -10,10 +10,10 @@ fn by_column() {
| skip 1 | skip 1
| first 4 | first 4
| split column "=" | split column "="
| sort-by Column1 | sort-by column1
| skip 1 | skip 1
| first 1 | first 1
| get Column1 | get column1
| str trim | str trim
"# "#
)); ));
@ -36,7 +36,7 @@ fn by_invalid_column() {
| sort-by ColumnThatDoesNotExist | sort-by ColumnThatDoesNotExist
| skip 1 | skip 1
| first 1 | first 1
| get Column1 | get column1
| str trim | str trim
"# "#
)); ));

2
crates/nu-command/tests/commands/split_column.rs
View File

@ -19,7 +19,7 @@ fn to_column() {
| lines | lines
| str trim | str trim
| split column "," | split column ","
| get Column2 | get column2
"# "#
)); ));

2
crates/nu-command/tests/format_conversions/csv.rs
View File

@ -199,7 +199,7 @@ fn from_csv_text_skipping_headers_to_table() {
r#" r#"
open los_tres_amigos.txt open los_tres_amigos.txt
| from csv --noheaders | from csv --noheaders
| get Column3 | get column3
| length | length
"# "#
)); ));

2
crates/nu-command/tests/format_conversions/ods.rs
View File

@ -8,7 +8,7 @@ fn from_ods_file_to_table() {
open sample_data.ods open sample_data.ods
| get SalesOrders | get SalesOrders
| get 4 | get 4
| get Column2 | get column2
"# "#
)); ));

4
crates/nu-command/tests/format_conversions/ssv.rs
View File

@ -74,7 +74,7 @@ fn from_ssv_text_treating_first_line_as_data_with_flag() {
open oc_get_svc.txt open oc_get_svc.txt
| from ssv --noheaders -a | from ssv --noheaders -a
| first | first
| get Column1 | get column1
"# "#
)); ));
@ -84,7 +84,7 @@ fn from_ssv_text_treating_first_line_as_data_with_flag() {
open oc_get_svc.txt open oc_get_svc.txt
| from ssv --noheaders | from ssv --noheaders
| first | first
| get Column1 | get column1
"# "#
)); ));

2
crates/nu-command/tests/format_conversions/tsv.rs
View File

@ -122,7 +122,7 @@ fn from_tsv_text_skipping_headers_to_table() {
r#" r#"
open los_tres_amigos.txt open los_tres_amigos.txt
| from tsv --noheaders | from tsv --noheaders
| get Column3 | get column3
| length | length
"# "#
)); ));

2
crates/nu-command/tests/format_conversions/xlsx.rs
View File

@ -8,7 +8,7 @@ fn from_excel_file_to_table() {
open sample_data.xlsx open sample_data.xlsx
| get SalesOrders | get SalesOrders
| get 4 | get 4
| get Column2 | get column2
"# "#
)); ));

2
crates/nu_plugin_query/src/query_web.rs
View File

@ -180,7 +180,7 @@ fn retrieve_table(mut table: WebTable, columns: &Value, span: Span) -> Value {
let mut vals = vec![]; let mut vals = vec![];
for row in &table_with_no_empties { for row in &table_with_no_empties {
for (counter, cell) in row.iter().enumerate() { for (counter, cell) in row.iter().enumerate() {
cols.push(format!("Column{}", counter)); cols.push(format!("column{}", counter));
vals.push(Value::string(cell.to_string(), span)) vals.push(Value::string(cell.to_string(), span))
} }
} }

2
src/tests/test_table_operations.rs
View File

@ -180,7 +180,7 @@ fn split_row() -> TestResult {
#[test] #[test]
fn split_column() -> TestResult { fn split_column() -> TestResult {
run_test( run_test(
r#""hello world" | split column " " | get "Column1".0"#, r#""hello world" | split column " " | get "column1".0"#,
"hello", "hello",
) )
} }