Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-12 21:29:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Display rows in the same table regardless of their column order given they are equal. (#1392)" (#1401)

Browse source 
This reverts commit 4fd9974204.
This commit is contained in:
Jonathan Turner 2020-02-17 17:34:37 -08:00 committed by GitHub
parent 4fd9974204
commit afce2fd0f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/commands/table.rs
View file

@ -72,21 +72,13 @@ fn table(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream,
Some(a) => { Some(a) => {
if !new_input.is_empty() { if !new_input.is_empty() {
if let Some(descs) = new_input.get(0) { if let Some(descs) = new_input.get(0) {
let descs = descs.data_descriptors(); let descs = descs.data_descriptors();
let descs_size = descs.len(); let compare = a.data_descriptors();
if descs != compare {
let a_descs = a.data_descriptors();
let mut compare = a_descs;
compare.extend(descs.into_iter());
compare.dedup();
if !compare.is_empty() {
new_input.push_back(a);
} else {
delay_slot = Some(a); delay_slot = Some(a);
break; break;
} else {
new_input.push_back(a);
} }
} else { } else {
new_input.push_back(a); new_input.push_back(a);

30
tests/shell/pipeline/mod.rs
View file

@ -1,8 +1,6 @@
mod commands; mod commands;
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
use nu_test_support::nu; use nu_test_support::nu;
use nu_test_support::playground::Playground;
#[test] #[test]
fn doesnt_break_on_utf8() { fn doesnt_break_on_utf8() {
@ -10,31 +8,3 @@ fn doesnt_break_on_utf8() {
assert_eq!(actual, "ö", "'{}' should contain ö", actual); assert_eq!(actual, "ö", "'{}' should contain ö", actual);
} }
#[test]
fn visualize_one_table_given_rows_with_same_columns_regardless_of_their_order_per_row() {
Playground::setup("visualize_table_test_1", |dirs, sandbox| {
sandbox.with_files(vec![FileWithContentToBeTrimmed(
"unordered_columns.txt",
r#"
[
{"name":"Andrés", "rusty_luck": 1 },
{"rusty_luck": 1, "name": "Jonathan"},
]
"#,
)]);
let actual = nu!(
cwd: dirs.test(), "open unordered_columns.txt | from-json"
);
let name_column_indices: Vec<_> = actual.match_indices("name").collect();
let rusty_luck_column_indices: Vec<_> = actual.match_indices("rusty_luck").collect();
for (index, (name_index, _)) in name_column_indices.iter().enumerate() {
let (rusty_luck_index, _) = rusty_luck_column_indices[index];
assert!(name_index < &rusty_luck_index);
}
})
}