forked from extern/nushell
6b4282eadf
# Description This PR moves the `where` command to a parser keyword. While it still uses the shape-directed parsing dictated by the signature, we're free to change the parsing code now to a custom one once we remove the syntax shapes. As a side effect, the `where -b` flag was removed and its functionality has moved to the new `filter` command. Just FYI, other commands that take row conditions: - `take until` - `take while` - `skip until` - `skip while` - `any` - `all` We can either move these to the parser as well or make them accept a closure instead of row condition. # User-Facing Changes New `filter` command which replaces `where -b` functionality. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
191 lines
4.0 KiB
Rust
191 lines
4.0 KiB
Rust
use nu_test_support::nu;
|
|
#[cfg(feature = "sqlite")]
|
|
use nu_test_support::pipeline;
|
|
|
|
#[test]
|
|
fn filters_by_unit_size_comparison() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats",
|
|
"ls | where size > 1kib | sort-by size | get name | first | str trim"
|
|
);
|
|
|
|
assert_eq!(actual.out, "cargo_sample.toml");
|
|
}
|
|
|
|
#[test]
|
|
fn filters_with_nothing_comparison() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats",
|
|
r#"'[{"foo": 3}, {"foo": null}, {"foo": 4}]' | from json | get foo | compact | where $it > 1 | math sum"#
|
|
);
|
|
|
|
assert_eq!(actual.out, "7");
|
|
}
|
|
|
|
#[test]
|
|
fn where_inside_block_works() {
|
|
let actual = nu!(
|
|
cwd: ".",
|
|
"{|x| ls | where $it =~ 'foo' } | describe"
|
|
);
|
|
|
|
assert_eq!(actual.out, "closure");
|
|
}
|
|
|
|
#[test]
|
|
fn filters_with_0_arity_block() {
|
|
let actual = nu!(
|
|
cwd: ".",
|
|
"[1 2 3 4] | where { $in < 3 } | to nuon"
|
|
);
|
|
|
|
assert_eq!(actual.out, "[1, 2]");
|
|
}
|
|
|
|
#[test]
|
|
fn filters_with_1_arity_block() {
|
|
let actual = nu!(
|
|
cwd: ".",
|
|
"[1 2 3 6 7 8] | where {|e| $e < 5 } | to nuon"
|
|
);
|
|
|
|
assert_eq!(actual.out, "[1, 2, 3]");
|
|
}
|
|
|
|
#[test]
|
|
fn unique_env_each_iteration() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats",
|
|
"[1 2] | where { print ($env.PWD | str ends-with 'formats') | cd '/' | true } | to nuon"
|
|
);
|
|
|
|
assert_eq!(actual.out, "truetrue[1, 2]");
|
|
}
|
|
|
|
#[test]
|
|
fn where_in_table() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats",
|
|
r#"'[{"name": "foo", "size": 3}, {"name": "foo", "size": 2}, {"name": "bar", "size": 4}]' | from json | where name in ["foo"] | get size | math sum"#
|
|
);
|
|
|
|
assert_eq!(actual.out, "5");
|
|
}
|
|
|
|
#[test]
|
|
fn where_not_in_table() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats",
|
|
r#"'[{"name": "foo", "size": 3}, {"name": "foo", "size": 2}, {"name": "bar", "size": 4}]' | from json | where name not-in ["foo"] | get size | math sum"#
|
|
);
|
|
|
|
assert_eq!(actual.out, "4");
|
|
}
|
|
|
|
#[test]
|
|
fn uses_optional_index_argument() {
|
|
let actual = nu!(
|
|
cwd: ".",
|
|
r#"[7 8 9 10] | where {|el ind| $ind < 2 } | to nuon"#
|
|
);
|
|
|
|
assert_eq!(actual.out, "[7, 8]");
|
|
}
|
|
|
|
#[cfg(feature = "sqlite")]
|
|
#[test]
|
|
fn binary_operator_comparisons() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get ints
|
|
| first 4
|
|
| where z > 4200
|
|
| get z.0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "4253");
|
|
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get ints
|
|
| first 4
|
|
| where z >= 4253
|
|
| get z.0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "4253");
|
|
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get ints
|
|
| first 4
|
|
| where z < 10
|
|
| get z.0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "1");
|
|
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get ints
|
|
| first 4
|
|
| where z <= 1
|
|
| get z.0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "1");
|
|
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get ints
|
|
| where z != 1
|
|
| first
|
|
| get z
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "42");
|
|
}
|
|
|
|
#[cfg(feature = "sqlite")]
|
|
#[test]
|
|
fn contains_operator() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get strings
|
|
| where x =~ ell
|
|
| length
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "4");
|
|
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
r#"
|
|
open sample.db
|
|
| get strings
|
|
| where x !~ ell
|
|
| length
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "2");
|
|
}
|