test: Integration test failures easier to understand (#2604)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: max-sixty

bacon.toml

@@ -53,7 +53,7 @@ a = "job:check-all"
 c = "job:clippy"
 d = "job:doc-open"
 f = "job:test-fast"
-# `g` for standard carGo tests
+# `g` for standard cargo tests
 g = "job:test-cargo"
 r = "job:run"
 t = "job:test"

prql-compiler/tests/integration/main.rs

@@ -36,11 +36,7 @@ fn compile(prql: &str) -> Result<String, prql_compiler::ErrorMessages> {
 fn test_sql_examples() {
     glob!("queries/**/*.prql", |path| {
         let sql = fs::read_to_string(path).unwrap();
-        assert_snapshot!(
-            path.file_name().unwrap().to_string_lossy().to_string(),
-            compile(&sql).unwrap(),
-            &sql
-        )
+        assert_snapshot!("sql", compile(&sql).unwrap(), &sql)
     });
 }
 
@@ -56,7 +52,7 @@ fn test_rdbms() {
     // for each of the queries
     glob!("queries/**/*.prql", |path| {
         let test_name = path
-            .file_name()
+            .file_stem()
             .and_then(|s| s.to_str())
             .unwrap_or_default();
 
@@ -98,7 +94,7 @@ fn test_rdbms() {
         for row in first_result.1 {
             writeln!(&mut result_string, "{}", row.join(",")).unwrap_or_default();
         }
-        assert_snapshot!(result_string);
+        assert_snapshot!("results", result_string, &prql);
     });
 }
 

prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from tracks\nsort [-bytes]\nselect [\n    name,\n    bin = ((album_id | as REAL) * 99)\n]\ntake 20\n"
 input_file: prql-compiler/tests/integration/queries/cast.prql
 ---
 Through a Looking Glass,22671

prql-compiler/tests/integration/snapshots/integration__rdbms@set_ops_remove.prql.snap

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from tracks\nselect [album_id, genre_id]\ngroup tracks.* (take 1)\nsort tracks.*\n"
 input_file: prql-compiler/tests/integration/queries/distinct.prql
 ---
 1,1

prql-compiler/tests/integration/snapshots/[email protected] renamed to prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "let genre_count = (\n    from genres\n    aggregate a = count\n)\n\nfrom genre_count\nfilter a > 0\nselect a = -a\n"
 input_file: prql-compiler/tests/integration/queries/genre_counts.prql
 ---
 -25

prql-compiler/tests/integration/snapshots/[email protected] renamed to prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from a=albums\ntake 10\njoin tracks [==album_id]\ngroup [a.album_id, a.title] (aggregate price = ((sum tracks.unit_price)))\nsort album_id\n"
 input_file: prql-compiler/tests/integration/queries/group_all.prql
 ---
 1,For Those About To Rock We Salute You,9.9

prql-compiler/tests/integration/snapshots/integration__rdbms@genre_counts.prql.snap renamed to prql-compiler/tests/integration/snapshots/integration__results@genre_counts.prql.snap

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from tracks\nderive d = album_id + 1\ngroup d (\n    aggregate [\n        n1 = (track_id | sum),\n    ]\n)\nsort d\ntake 10\nselect [ d1 = d, n1 ]\n"
 input_file: prql-compiler/tests/integration/queries/group_sort.prql
 ---
 2,91

prql-compiler/tests/integration/snapshots/integration__rdbms@group_all.prql.snap renamed to prql-compiler/tests/integration/snapshots/integration__results@group_all.prql.snap

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "# skip_mssql (error: The function 'LAG' may not have a window frame.)\nfrom i=invoices\njoin ii=invoice_items [==invoice_id]\nderive [\n    city = i.billing_city,\n    street = i.billing_address,\n]\ngroup [city, street] (\n    aggregate [\n        num_orders = s\"COUNT(DISTINCT {i.invoice_id})\",\n        num_tracks = sum ii.quantity,\n        total_price = sum (ii.unit_price * ii.quantity),\n    ]\n)\ngroup [city] (\n    sort street\n    window expanding:true (\n        derive [running_total_num_tracks = sum num_tracks]\n    )\n)\nsort city\nderive [num_tracks_last_week = lag 7 num_tracks]\nselect [\n    city,\n    street,\n    num_orders,\n    num_tracks,\n    running_total_num_tracks,\n    num_tracks_last_week\n]\ntake 20\n"
 input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
 ---
 Amsterdam,Lijnbaansgracht 120bg,7,38,38,

prql-compiler/tests/integration/snapshots/integration__rdbms@group_sort.prql.snap renamed to prql-compiler/tests/integration/snapshots/integration__results@group_sort.prql.snap

@@ -0,0 +1,12 @@
+---
+source: prql-compiler/tests/integration/main.rs
+expression: "# skip_mssql (the keyword RECURSIVE is not allowed and you have to declare the columns for CTE)\nfrom_text format:json '[{\"n\": 1 }]'\nselect n = n - 2\nloop (\n    filter n<4\n    select n = n+1\n)\nselect n = n * 2\n"
+input_file: prql-compiler/tests/integration/queries/loop.prql
+---
+-2
+0
+2
+4
+6
+8
+

prql-compiler/tests/integration/snapshots/integration__rdbms@invoice_totals.prql.snap renamed to prql-compiler/tests/integration/snapshots/integration__results@invoice_totals.prql.snap

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "# skip_mssql (https://github.com/PRQL/prql/issues/2448)\n# skip_mysql (regex not yet implemented)\n# skip_sqlite (regex not yet implemented)\n# booleans cannot be selected directly. instead CASE is needed (https://dba.stackexchange.com/a/2774)\nfrom tracks\n\nfilter (name ~= \"Love\")\nfilter ((milliseconds / 1000 / 60) | in 3..4)\nsort track_id\ntake 1..15\nselect [name, composer]\n"
 input_file: prql-compiler/tests/integration/queries/pipelines.prql
 ---
 My Love,Jauperi/Zeu Góes

prql-compiler/tests/integration/snapshots/[email protected]

@@ -0,0 +1,7 @@
+---
+source: prql-compiler/tests/integration/main.rs
+expression: "let distinct = rel -> (from t = _param.rel | group [t.*] (take 1))\n\nfrom_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2], [2], [3]] }'\ndistinct\nremove (from_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2]] }')\n"
+input_file: prql-compiler/tests/integration/queries/set_ops_remove.prql
+---
+3
+

prql-compiler/tests/integration/snapshots/[email protected] renamed to prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from e=employees\nfilter first_name != \"Mitchell\"\nsort [first_name, last_name]\n\n# joining may use HashMerge, which can undo ORDER BY\njoin manager=employees side:left [e.reports_to == manager.employee_id]\n\nselect [e.first_name, e.last_name, manager.first_name]\n"
 input_file: prql-compiler/tests/integration/queries/sort.prql
 ---
 Andrew,Adams,Michael

prql-compiler/tests/integration/snapshots/integration__results@set_ops_remove.prql.snap

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: result_string
+expression: "from tracks\nsort milliseconds\nselect display = case [\n    composer != null => composer,\n    genre_id < 17 => 'no composer',\n    true => f'unknown composer'\n]\ntake 10\n"
 input_file: prql-compiler/tests/integration/queries/switch.prql
 ---
 Samuel Rosa

prql-compiler/tests/integration/snapshots/[email protected] renamed to prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: "# skip_mssql\nlet distinct = rel -> (from t = _param.rel | group [t.*] (take 1))\n\nfrom_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2], [2], [3]] }'\ndistinct\nremove (from_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2]] }')\n"
+expression: "let distinct = rel -> (from t = _param.rel | group [t.*] (take 1))\n\nfrom_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2], [2], [3]] }'\ndistinct\nremove (from_text format:json '{ \"columns\": [\"a\"], \"data\": [[1], [2]] }')\n"
 input_file: prql-compiler/tests/integration/queries/set_ops_remove.prql
 ---
 WITH table_4 AS (

prql-compiler/tests/integration/snapshots/[email protected] renamed to prql-compiler/tests/integration/snapshots/[email protected]

@@ -1,6 +1,6 @@
 ---
 source: prql-compiler/tests/integration/main.rs
-expression: "from e=employees\nfilter first_name != \"Mitchell\"\nsort [first_name, last_name]\n\n# joining may use HashMerge, which can undo ORDER BY\njoin manager=employees side:left [e.reports_to == manager.employee_id]\n\nselect [e.first_name, e.last_name, manager.first_name]"
+expression: "from e=employees\nfilter first_name != \"Mitchell\"\nsort [first_name, last_name]\n\n# joining may use HashMerge, which can undo ORDER BY\njoin manager=employees side:left [e.reports_to == manager.employee_id]\n\nselect [e.first_name, e.last_name, manager.first_name]\n"
 input_file: prql-compiler/tests/integration/queries/sort.prql
 ---
 WITH table_1 AS (