extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-16 18:41:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flatten rows containing same sub-table columns with distinct column names. (#2684)

Browse Source
This commit is contained in:
Andrés N. Robalino 2020-10-20 05:37:40 -05:00 committed by GitHub
parent b6d19cc9fa
commit 5725e55abb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu-cli/src/commands/flatten.rs
View File

@ -100,12 +100,20 @@ fn flat_value(
} = value
{
if column_requested.is_none() && !columns.is_empty() {
out.insert_value(column, value.clone());
if out.contains_key(&column) {
out.insert_value(format!("{}_{}", column, column), value.clone());
} else {
out.insert_value(column, value.clone());
}
continue;
}
for (k, v) in mapa.into_iter() {
out.insert_value(k, v.clone());
if out.contains_key(k) {
out.insert_value(format!("{}_{}", column, k), v.clone());
} else {
out.insert_value(k, v.clone());
}
}
} else if value.is_table() {
if tables_explicitly_flattened >= 1 && column_requested.is_some() {

64
crates/nu-cli/tests/commands/flatten.rs
View File

@ -54,24 +54,16 @@ fn flatten_row_column_explictly() {
r#"
[
{
"origin": "Ecuador",
"people": {
"name": "Andres",
"meal": "arepa"
},
"code": { "id": 1, "references": 2},
"tags": ["carbohydrate", "corn", "maiz"],
"city": ["Guayaquil", "Samborondón"]
}
},
{
"origin": "USA",
"people": {
"name": "Katz",
"meal": "nurepa"
},
"code": { "id": 2, "references": 1},
"tags": ["carbohydrate", "shell food", "amigos flavor"],
"city": ["Oregon", "Brooklin"]
}
}
]
"#,
@ -87,30 +79,58 @@ fn flatten_row_column_explictly() {
}
#[test]
fn flatten_table_columns_explictly() {
fn flatten_row_columns_having_same_column_names_flats_separately() {
Playground::setup("flatten_test_2", |dirs, sandbox| {
sandbox.with_files(vec![FileWithContentToBeTrimmed(
"katz.json",
r#"
[
{
"origin": "Ecuador",
"people": {
"name": "Andres",
"meal": "arepa"
},
"code": { "id": 1, "references": 2},
"tags": ["carbohydrate", "corn", "maiz"],
"city": ["Guayaquil", "Samborondón"]
"city": [{"name": "Guayaquil"}, {"name": "Samborondón"}]
},
{
"people": {
"name": "Katz",
"meal": "nurepa"
},
"city": [{"name": "Oregon"}, {"name": "Brooklin"}]
}
]
"#,
)]);
let actual = nu!(
cwd: dirs.test(),
"open katz.json | flatten | flatten people city | get city_name | count"
);
assert_eq!(actual.out, "4");
})
}
#[test]
fn flatten_table_columns_explictly() {
Playground::setup("flatten_test_3", |dirs, sandbox| {
sandbox.with_files(vec![FileWithContentToBeTrimmed(
"katz.json",
r#"
[
{
"people": {
"name": "Andres",
"meal": "arepa"
},
"city": ["Guayaquil", "Samborondón"]
},
{
"origin": "USA",
"people": {
"name": "Katz",
"meal": "nurepa"
},
"code": { "id": 2, "references": 1},
"tags": ["carbohydrate", "shell food", "amigos flavor"],
"city": ["Oregon", "Brooklin"]
}
]
@ -128,28 +148,24 @@ fn flatten_table_columns_explictly() {
#[test]
fn flatten_more_than_one_column_that_are_subtables_not_supported() {
Playground::setup("flatten_test_3", |dirs, sandbox| {
Playground::setup("flatten_test_4", |dirs, sandbox| {
sandbox.with_files(vec![FileWithContentToBeTrimmed(
"katz.json",
r#"
[
{
"origin": "Ecuador",
"people": {
"name": "Andres",
"meal": "arepa"
},
"code": { "id": 1, "references": 2},
}
"tags": ["carbohydrate", "corn", "maiz"],
"city": ["Guayaquil", "Samborondón"]
},
{
"origin": "USA",
"people": {
"name": "Katz",
"meal": "nurepa"
},
"code": { "id": 2, "references": 1},
"tags": ["carbohydrate", "shell food", "amigos flavor"],
"city": ["Oregon", "Brooklin"]
}

5
crates/nu-protocol/src/value/dict.rs
View File

@ -252,6 +252,11 @@ impl TaggedDictBuilder {
pub fn is_empty(&self) -> bool {
self.dict.is_empty()
}
/// Checks if given key exists
pub fn contains_key(&self, key: &str) -> bool {
self.dict.contains_key(key)
}
}
impl From<TaggedDictBuilder> for Value {