extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix select on empty lists (#8651)

Browse Source 
This PR fixes `select` when given an empty list; it used to return
`null` when given an empty list. I also cleaned up other `select` tests
while I was in the area.

### Before:

```
> [] | select a | to nuon
null
```

### After:

```
> [] | select a | to nuon
[]
```

It looks like the previous behaviour was accidentally introduced by
[this PR](https://github.com/nushell/nushell/pull/7639).
This commit is contained in:
Reilly Wood 2023-03-28 12:40:29 -07:00 committed by GitHub
parent 9f01cf333c
commit da8cb14f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/nu-command/src/filters/select.rs
View File

@ -167,7 +167,6 @@ fn select(
) => { ) => {
let mut output = vec![]; let mut output = vec![];
let mut columns_with_value = Vec::new(); let mut columns_with_value = Vec::new();
let mut allempty = true;
for input_val in input_vals { for input_val in input_vals {
if !columns.is_empty() { if !columns.is_empty() {
let mut cols = vec![]; let mut cols = vec![];
@ -176,7 +175,6 @@ fn select(
//FIXME: improve implementation to not clone //FIXME: improve implementation to not clone
match input_val.clone().follow_cell_path(&path.members, false) { match input_val.clone().follow_cell_path(&path.members, false) {
Ok(fetcher) => { Ok(fetcher) => {
allempty = false;
cols.push(path.into_string().replace('.', "_")); cols.push(path.into_string().replace('.', "_"));
vals.push(fetcher); vals.push(fetcher);
if !columns_with_value.contains(&path) { if !columns_with_value.contains(&path) {
@ -194,14 +192,11 @@ fn select(
output.push(input_val) output.push(input_val)
} }
} }
if allempty {
Ok(Value::nothing(call_span).into_pipeline_data()) Ok(output
} else { .into_iter()
Ok(output .into_pipeline_data(engine_state.ctrlc.clone())
.into_iter() .set_metadata(metadata))
.into_pipeline_data(engine_state.ctrlc.clone())
.set_metadata(metadata))
}
} }
PipelineData::ListStream(stream, metadata, ..) => { PipelineData::ListStream(stream, metadata, ..) => {
let mut values = vec![]; let mut values = vec![];

77
crates/nu-command/tests/commands/select.rs
View File

@ -4,7 +4,7 @@ use nu_test_support::{nu, pipeline};
#[test] #[test]
fn regular_columns() { fn regular_columns() {
let actual = nu!(cwd: ".", pipeline( let actual = nu!(pipeline(
r#" r#"
echo [ echo [
[first_name, last_name, rusty_at, type]; [first_name, last_name, rusty_at, type];
@ -67,7 +67,7 @@ fn complex_nested_columns() {
#[test] #[test]
fn fails_if_given_unknown_column_name() { fn fails_if_given_unknown_column_name() {
let actual = nu!(cwd: ".", pipeline( let actual = nu!(pipeline(
r#" r#"
echo [ echo [
[first_name, last_name, rusty_at, type]; [first_name, last_name, rusty_at, type];
@ -86,7 +86,7 @@ fn fails_if_given_unknown_column_name() {
#[test] #[test]
fn column_names_with_spaces() { fn column_names_with_spaces() {
let actual = nu!(cwd: ".", pipeline( let actual = nu!(pipeline(
r#" r#"
echo [ echo [
["first name", "last name"]; ["first name", "last name"];
@ -105,7 +105,7 @@ fn column_names_with_spaces() {
#[test] #[test]
fn ignores_duplicate_columns_selected() { fn ignores_duplicate_columns_selected() {
let actual = nu!(cwd: ".", pipeline( let actual = nu!(pipeline(
r#" r#"
echo [ echo [
["first name", "last name"]; ["first name", "last name"];
@ -162,12 +162,7 @@ fn selects_many_rows() {
#[test] #[test]
fn select_ignores_errors_successfully1() { fn select_ignores_errors_successfully1() {
let actual = nu!( let actual = nu!("[{a: 1, b: 2} {a: 3, b: 5} {a: 3}] | select b? | length");
cwd: ".", pipeline(
r#"
[{a: 1, b: 2} {a: 3, b: 5} {a: 3}] | select b? | length
"#
));
assert_eq!(actual.out, "3".to_string()); assert_eq!(actual.out, "3".to_string());
assert!(actual.err.is_empty()); assert!(actual.err.is_empty());
@ -175,12 +170,7 @@ fn select_ignores_errors_successfully1() {
#[test] #[test]
fn select_ignores_errors_successfully2() { fn select_ignores_errors_successfully2() {
let actual = nu!( let actual = nu!("[{a: 1} {a: 2} {a: 3}] | select b? | to nuon");
cwd: ".", pipeline(
r#"
[{a: 1} {a: 2} {a: 3}] | select b? | to nuon
"#
));
assert_eq!(actual.out, "[[b]; [null], [null], [null]]".to_string()); assert_eq!(actual.out, "[[b]; [null], [null], [null]]".to_string());
assert!(actual.err.is_empty()); assert!(actual.err.is_empty());
@ -188,10 +178,7 @@ fn select_ignores_errors_successfully2() {
#[test] #[test]
fn select_ignores_errors_successfully3() { fn select_ignores_errors_successfully3() {
let actual = nu!( let actual = nu!("sys | select invalid_key? | to nuon");
cwd: ".", pipeline(
r#"sys | select invalid_key? | to nuon"#
));
assert_eq!(actual.out, "{invalid_key: null}".to_string()); assert_eq!(actual.out, "{invalid_key: null}".to_string());
assert!(actual.err.is_empty()); assert!(actual.err.is_empty());
@ -199,10 +186,8 @@ fn select_ignores_errors_successfully3() {
#[test] #[test]
fn select_ignores_errors_successfully4() { fn select_ignores_errors_successfully4() {
let actual = nu!( let actual =
cwd: ".", pipeline( nu!(r#""key val\na 1\nb 2\n" | lines | split column -c " " | select foo? | to nuon"#);
r#""key val\na 1\nb 2\n" | lines | split column -c " " | select foo? | to nuon"#
));
assert_eq!(actual.out, r#"[[foo]; [null], [null], [null]]"#.to_string()); assert_eq!(actual.out, r#"[[foo]; [null], [null], [null]]"#.to_string());
assert!(actual.err.is_empty()); assert!(actual.err.is_empty());
@ -210,12 +195,7 @@ fn select_ignores_errors_successfully4() {
#[test] #[test]
fn select_failed1() { fn select_failed1() {
let actual = nu!( let actual = nu!("[{a: 1, b: 2} {a: 3, b: 5} {a: 3}] | select b ");
cwd: ".", pipeline(
r#"
[{a: 1, b: 2} {a: 3, b: 5} {a: 3}] | select b
"#
));
assert!(actual.out.is_empty()); assert!(actual.out.is_empty());
assert!(actual.err.contains("cannot find column")); assert!(actual.err.contains("cannot find column"));
@ -223,12 +203,7 @@ fn select_failed1() {
#[test] #[test]
fn select_failed2() { fn select_failed2() {
let actual = nu!( let actual = nu!("[{a: 1} {a: 2} {a: 3}] | select b");
cwd: ".", pipeline(
r#"
[{a: 1} {a: 2} {a: 3}] | select b
"#
));
assert!(actual.out.is_empty()); assert!(actual.out.is_empty());
assert!(actual.err.contains("cannot find column")); assert!(actual.err.contains("cannot find column"));
@ -236,10 +211,7 @@ fn select_failed2() {
#[test] #[test]
fn select_failed3() { fn select_failed3() {
let actual = nu!( let actual = nu!(r#""key val\na 1\nb 2\n" | lines | split column -c " " | select "100""#);
cwd: ".", pipeline(
r#""key val\na 1\nb 2\n" | lines | split column -c " " | select "100""#
));
assert!(actual.out.is_empty()); assert!(actual.out.is_empty());
assert!(actual.err.contains("cannot find column")); assert!(actual.err.contains("cannot find column"));
@ -247,25 +219,28 @@ fn select_failed3() {
#[test] #[test]
fn select_failed4() { fn select_failed4() {
let actual = nu!( let actual = nu!("[{a: 1 b: 10}, {a:2, b:11}] | select 0 0");
cwd: ".", pipeline(
r#"
[{a: 1 b: 10}, {a:2, b:11}] | select 0 0
"#
));
assert!(actual.err.contains("Select can't get the same row twice")); assert!(actual.err.contains("Select can't get the same row twice"));
} }
#[test] #[test]
fn ignore_errors_works() { fn ignore_errors_works() {
let actual = nu!( let actual = nu!(r#"
cwd: ".",
r#"
let path = "foo"; let path = "foo";
[{}] | select -i $path | to nuon [{}] | select -i $path | to nuon
"# "#);
);
assert_eq!(actual.out, "[[foo]; [null]]"); assert_eq!(actual.out, "[[foo]; [null]]");
} }
#[test]
fn select_on_empty_list_returns_empty_list() {
// once with a List
let actual = nu!("[] | select foo | to nuon");
assert_eq!(actual.out, "[]");
// and again with a ListStream
let actual = nu!("[] | each {|i| $i} | select foo | to nuon");
assert_eq!(actual.out, "[]");
}