Skip to content

Commit

Permalink
Bump csv-diff to 0.1.1
Browse files Browse the repository at this point in the history
This fixes part of #2443, where sorting the diff result by line
has been non-deterministic.

For further details, please see the MR in `csv-diff`:
https://gitlab.com/janriemer/csv-diff/-/merge_requests/31
  • Loading branch information
Jan Riemer committed Jan 19, 2025
1 parent 183c835 commit 574452e
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 21 deletions.
40 changes: 20 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ crc32fast = { version = "1.4", optional = true }
crossbeam-channel = "0.5"
csv = "1.3"
csv-core = "0.1"
csv-diff = "0.1.0"
csv-diff = "0.1"
csv-index = "0.1"
csvlens = { version = "0.11", optional = true, default-features = false, features = [
"clipboard",
Expand Down
37 changes: 37 additions & 0 deletions tests/test_diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,43 @@ diffresult,case_enquiry_id,open_dt,target_dt,closed_dt,ontime,case_status,closur
}
}

#[test]
fn diff_sort_diff_result_by_lines_by_default_modified_rows_interleaved() {
let wrk = Workdir::new("diff_sort_diff_result_by_lines_by_default_modified_rows_interleaved");

let left = vec![
svec!["h1", "h2", "h3"],
svec!["4", "foo", "bar"],
svec!["2", "drix", "druux"],
svec!["3", "higgs", "corge"],
];
wrk.create("left.csv", left);

let right = vec![
svec!["h1", "h2", "h3"],
svec!["1", "foo", "bar"],
svec!["3", "higgs_changed", "corge"],
svec!["2", "drix_changed", "druux"],
];
wrk.create("right.csv", right);

let mut cmd = wrk.command("diff");
cmd.args(["left.csv", "right.csv"]);

let got: Vec<Vec<String>> = wrk.read_stdout(&mut cmd);
let expected: Vec<Vec<String>> = vec![
svec!["diffresult", "h1", "h2", "h3"],
svec!["-", "4", "foo", "bar"],
svec!["+", "1", "foo", "bar"],
svec!["-", "2", "drix", "druux"],
svec!["+", "2", "drix_changed", "druux"],
svec!["-", "3", "higgs", "corge"],
svec!["+", "3", "higgs_changed", "corge"],
];

assert_eq!(got, expected);
}

#[test]
fn diff_sort_diff_result_by_first_column() {
let wrk = Workdir::new("diff");
Expand Down

0 comments on commit 574452e

Please sign in to comment.