2022-03-17 18:55:02 +01:00
|
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn sets_the_column() {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
|
|
r#"
|
|
|
|
open cargo_sample.toml
|
|
|
|
| upsert dev-dependencies.pretty_assertions "0.7.0"
|
|
|
|
| get dev-dependencies.pretty_assertions
|
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
assert_eq!(actual.out, "0.7.0");
|
|
|
|
}
|
|
|
|
|
2022-11-21 14:35:11 +01:00
|
|
|
#[test]
|
|
|
|
fn doesnt_convert_record_to_table() {
|
2023-04-28 13:25:44 +02:00
|
|
|
let actual = nu!("{a:1} | upsert a 2 | to nuon");
|
2022-11-21 14:35:11 +01:00
|
|
|
assert_eq!(actual.out, "{a: 2}");
|
|
|
|
}
|
|
|
|
|
2022-03-17 18:55:02 +01:00
|
|
|
#[test]
|
|
|
|
fn sets_the_column_from_a_block_full_stream_output() {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
|
|
r#"
|
2022-12-07 19:31:57 +01:00
|
|
|
{content: null}
|
Restrict closure expression to be something like `{|| ...}` (#8290)
# Description
As title, closes: #7921 closes: #8273
# User-Facing Changes
when define a closure without pipe, nushell will raise error for now:
```
❯ let x = {ss ss}
Error: nu::parser::closure_missing_pipe
× Missing || inside closure
╭─[entry #2:1:1]
1 │ let x = {ss ss}
· ───┬───
· ╰── Parsing as a closure, but || is missing
╰────
help: Try add || to the beginning of closure
```
`any`, `each`, `all`, `where` command accepts closure, it forces user
input closure like `{||`, or parse error will returned.
```
❯ {major:2, minor:1, patch:4} | values | each { into string }
Error: nu::parser::closure_missing_pipe
× Missing || inside closure
╭─[entry #4:1:1]
1 │ {major:2, minor:1, patch:4} | values | each { into string }
· ───────┬───────
· ╰── Parsing as a closure, but || is missing
╰────
help: Try add || to the beginning of closure
```
`with-env`, `do`, `def`, `try` are special, they still remain the same,
although it says that it accepts a closure, but they don't need to be
written like `{||`, it's more likely a block but can capture variable
outside of scope:
```
❯ def test [input] { echo [0 1 2] | do { do { echo $input } } }; test aaa
aaa
```
Just realize that It's a big breaking change, we need to update config
and scripts...
# 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.
2023-03-17 13:36:28 +01:00
|
|
|
| upsert content {|| open --raw cargo_sample.toml | lines | first 5 }
|
2022-03-17 18:55:02 +01:00
|
|
|
| get content.1
|
|
|
|
| str contains "nu"
|
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
assert_eq!(actual.out, "true");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn sets_the_column_from_a_subexpression() {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
|
|
r#"
|
2022-12-07 19:31:57 +01:00
|
|
|
{content: null}
|
2022-03-17 18:55:02 +01:00
|
|
|
| upsert content (open --raw cargo_sample.toml | lines | first 5)
|
|
|
|
| get content.1
|
|
|
|
| str contains "nu"
|
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
assert_eq!(actual.out, "true");
|
|
|
|
}
|
2022-11-21 14:35:11 +01:00
|
|
|
|
|
|
|
#[test]
|
2023-02-02 23:59:58 +01:00
|
|
|
fn upsert_uses_enumerate_index_inserting() {
|
2022-11-21 14:35:11 +01:00
|
|
|
let actual = nu!(
|
2023-07-21 17:32:37 +02:00
|
|
|
"[[a]; [7] [6]] | enumerate | upsert b {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"
|
2023-07-17 18:43:51 +02:00
|
|
|
);
|
2022-11-21 14:35:11 +01:00
|
|
|
|
2023-02-02 23:59:58 +01:00
|
|
|
assert_eq!(actual.out, "[[index, a, b]; [0, 7, 8], [1, 6, 8]]");
|
2022-11-21 14:35:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2023-02-02 23:59:58 +01:00
|
|
|
fn upsert_uses_enumerate_index_updating() {
|
2023-04-28 13:25:44 +02:00
|
|
|
let actual = nu!("[[a]; [7] [6]] | enumerate | upsert a {|el| $el.index + 1 + $el.item.a } | flatten | to nuon");
|
2022-11-21 14:35:11 +01:00
|
|
|
|
2023-02-02 23:59:58 +01:00
|
|
|
assert_eq!(actual.out, "[[index, a]; [0, 8], [1, 8]]");
|
2022-11-21 14:35:11 +01:00
|
|
|
}
|
2022-12-06 21:26:27 +01:00
|
|
|
|
|
|
|
#[test]
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
fn upsert_into_list() {
|
|
|
|
let actual = nu!("[1, 2, 3] | upsert 1 abc | to json -r");
|
2022-12-06 21:26:27 +01:00
|
|
|
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
assert_eq!(actual.out, r#"[1,"abc",3]"#);
|
2022-12-06 21:26:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
fn upsert_at_end_of_list() {
|
|
|
|
let actual = nu!("[1, 2, 3] | upsert 3 abc | to json -r");
|
2022-12-06 21:26:27 +01:00
|
|
|
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
assert_eq!(actual.out, r#"[1,2,3,"abc"]"#);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upsert_past_end_of_list() {
|
|
|
|
let actual = nu!("[1, 2, 3] | upsert 5 abc");
|
|
|
|
|
|
|
|
assert!(actual
|
|
|
|
.err
|
|
|
|
.contains("can't insert at index (the next available index is 3)"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upsert_into_list_stream() {
|
|
|
|
let actual = nu!("[1, 2, 3] | every 1 | upsert 1 abc | to json -r");
|
|
|
|
|
|
|
|
assert_eq!(actual.out, r#"[1,"abc",3]"#);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upsert_at_end_of_list_stream() {
|
|
|
|
let actual = nu!("[1, 2, 3] | every 1 | upsert 3 abc | to json -r");
|
|
|
|
|
|
|
|
assert_eq!(actual.out, r#"[1,2,3,"abc"]"#);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upsert_past_end_of_list_stream() {
|
|
|
|
let actual = nu!("[1, 2, 3] | every 1 | upsert 5 abc");
|
|
|
|
|
|
|
|
assert!(actual
|
|
|
|
.err
|
|
|
|
.contains("can't insert at index (the next available index is 3)"));
|
2022-12-06 21:26:27 +01:00
|
|
|
}
|
2023-05-31 13:27:55 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upsert_support_lazy_record() {
|
|
|
|
let actual =
|
|
|
|
nu!(r#"let x = (lazy make -c ["h"] -g {|a| $a | str upcase}); $x | upsert h 10 | get h"#);
|
|
|
|
assert_eq!(actual.out, "10");
|
|
|
|
|
|
|
|
let actual =
|
|
|
|
nu!(r#"let x = (lazy make -c ["h"] -g {|a| $a | str upcase}); $x | upsert aa 10 | get aa"#);
|
|
|
|
assert_eq!(actual.out, "10");
|
|
|
|
}
|
2023-11-19 21:46:41 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn deep_cell_path_creates_all_nested_records() {
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
let actual = nu!("{a: {}} | upsert a.b.c 0 | get a.b.c");
|
2023-11-19 21:46:41 +01:00
|
|
|
assert_eq!(actual.out, "0");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn upserts_all_rows_in_table_in_record() {
|
|
|
|
let actual = nu!(
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
"{table: [[col]; [{a: 1}], [{a: 1}]]} | upsert table.col.b 2 | get table.col.b | to nuon"
|
2023-11-19 21:46:41 +01:00
|
|
|
);
|
|
|
|
assert_eq!(actual.out, "[2, 2]");
|
|
|
|
}
|
Fix replacement closures for `update`, `insert`, and `upsert` (#11258)
# Description
This PR addresses #11204 which points out that using a closure for the
replacement value with `update`, `insert`, or `upsert` does not work for
lists.
# User-Facing Changes
- Replacement closures should now work for lists in `upsert`, `insert`,
and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]`
instead of an unhelpful error.
- `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2,
null, null, 20]`, but now it gives an error. This was done to match the
intended behavior in `Value::insert_data_at_cell_path`, whereas the
behavior before was probably unintentional. Following
`Value::insert_data_at_cell_path`, inserting at the end of a list is
also fine, so the valid indices for `upsert` and `insert` are
`0..=length` just like `Vec::insert` or list inserts in other languages.
# Tests + Formatting
Added tests for `upsert`, `insert`, and `update`:
- Replacement closures for lists, list streams, records, and tables
- Other list stream tests
2023-12-09 22:22:45 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn list_replacement_closure() {
|
|
|
|
let actual = nu!("[1, 2] | upsert 1 {|i| $i + 1 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 3]");
|
|
|
|
|
|
|
|
let actual = nu!("[1, 2] | upsert 1 { $in + 1 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 3]");
|
|
|
|
|
|
|
|
let actual = nu!("[1, 2] | upsert 2 {|i| if $i == null { 0 } else { $in + 1 } } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 2, 0]");
|
|
|
|
|
|
|
|
let actual = nu!("[1, 2] | upsert 2 { if $in == null { 0 } else { $in + 1 } } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 2, 0]");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn record_replacement_closure() {
|
|
|
|
let actual = nu!("{ a: text } | upsert a {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: TEXT}");
|
|
|
|
|
|
|
|
let actual = nu!("{ a: text } | upsert a { str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: TEXT}");
|
|
|
|
|
|
|
|
let actual = nu!("{ a: text } | upsert b {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: text, b: TEXT}");
|
|
|
|
|
|
|
|
let actual = nu!("{ a: text } | upsert b { default TEXT } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: text, b: TEXT}");
|
|
|
|
|
|
|
|
let actual = nu!("{ a: { b: 1 } } | upsert a.c {|r| $r.a.b } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: {b: 1, c: 1}}");
|
|
|
|
|
|
|
|
let actual = nu!("{ a: { b: 1 } } | upsert a.c { default 0 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "{a: {b: 1, c: 0}}");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn table_replacement_closure() {
|
|
|
|
let actual = nu!("[[a]; [text]] | upsert a {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | upsert a { str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | upsert b {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a, b]; [text, TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | upsert b { default TEXT } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a, b]; [text, TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[b]; [1]] | wrap a | upsert a.c {|r| $r.a.b } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [{b: 1, c: 1}]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[b]; [1]] | wrap a | upsert a.c { default 0 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [{b: 1, c: 0}]]");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn list_stream_replacement_closure() {
|
|
|
|
let actual = nu!("[1, 2] | every 1 | upsert 1 {|i| $i + 1 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 3]");
|
|
|
|
|
|
|
|
let actual = nu!("[1, 2] | every 1 | upsert 1 { $in + 1 } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 3]");
|
|
|
|
|
|
|
|
let actual =
|
|
|
|
nu!("[1, 2] | every 1 | upsert 2 {|i| if $i == null { 0 } else { $in + 1 } } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 2, 0]");
|
|
|
|
|
|
|
|
let actual =
|
|
|
|
nu!("[1, 2] | every 1 | upsert 2 { if $in == null { 0 } else { $in + 1 } } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[1, 2, 0]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | every 1 | upsert a {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | every 1 | upsert a { str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | every 1 | upsert b {|r| $r.a | str upcase } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a, b]; [text, TEXT]]");
|
|
|
|
|
|
|
|
let actual = nu!("[[a]; [text]] | every 1 | upsert b { default TEXT } | to nuon");
|
|
|
|
assert_eq!(actual.out, "[[a, b]; [text, TEXT]]");
|
|
|
|
}
|