Update error messages to avoid wrapping (#6)

alamb · web-flow · commit a169d8ded675 · 2025-02-07T15:03:43.000-08:00
diff --git a/data/sqlite/random/aggregates/slt_good_109.slt b/data/sqlite/random/aggregates/slt_good_109.slt
@@ -53548,7 +53548,7 @@ SELECT ALL 74 * - CAST ( + col2 AS INTEGER ) AS col2 FROM tab1
 -7104
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT col1 FROM tab1 WHERE NOT col0 * 94 + + col1 / ( + col1 * 0 ) <> NULL
 
 query I rowsort label-8850
diff --git a/data/sqlite/random/aggregates/slt_good_11.slt b/data/sqlite/random/aggregates/slt_good_11.slt
@@ -25561,7 +25561,7 @@ SELECT + 19 + + col0 + + + col2 AS col0 FROM tab1
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 95
 skipif postgres
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT - ( - + 95 ) + - COUNT ( * ) AS col0 FROM tab1 WHERE NOT + col1 / - 26 * col0 + 58 / + 0 / - col2 - + col1 < NULL
 
 query I rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_123.slt b/data/sqlite/random/aggregates/slt_good_123.slt
@@ -19199,7 +19199,7 @@ SELECT DISTINCT + col2 + + ( - 35 ) AS col1 FROM tab0 cor0
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT * FROM tab1 AS cor0 CROSS JOIN tab1 AS cor1 WHERE NOT NULL = 38 / 0
 
 query II rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_124.slt b/data/sqlite/random/aggregates/slt_good_124.slt
@@ -58235,7 +58235,7 @@ SELECT + - 38 AS col0 FROM tab2 AS cor0
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT + - COUNT ( ALL col0 ) * COUNT ( * ) AS col1 FROM tab2 AS cor0 WHERE NOT NULL BETWEEN NULL AND - col1 / + - ( + 0 )
 
 query III rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_21.slt b/data/sqlite/random/aggregates/slt_good_21.slt
@@ -324,7 +324,7 @@ NULL
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT + 33 + col1 col0 FROM tab0 WHERE NOT 35 / 0 = ( NULL )
 
 query I rowsort label-50
diff --git a/data/sqlite/random/aggregates/slt_good_24.slt b/data/sqlite/random/aggregates/slt_good_24.slt
@@ -32078,7 +32078,7 @@ SELECT DISTINCT col0 * + - col0 FROM tab0
 -9409
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT * FROM tab1 WHERE + col2 * + CAST ( NULL AS INTEGER ) * col0 IN ( + col1 ) AND - 13 + - + 96 + + ( - + col0 ) / + - 0 BETWEEN - + col0 AND NULL
 
 query I rowsort label-5319
diff --git a/data/sqlite/random/aggregates/slt_good_25.slt b/data/sqlite/random/aggregates/slt_good_25.slt
@@ -2003,7 +2003,7 @@ SELECT - - COUNT ( * ) * - + CAST ( - COUNT ( * ) AS INTEGER ) + + COUNT ( * ) -
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT + col2 FROM tab0 AS cor0 WHERE NOT ( + + 14 / + 0 * + 90 - + 84 / + 67 ) < ( NULL ) AND NOT CAST ( col2 AS INTEGER ) = NULL
 
 query I rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_31.slt b/data/sqlite/random/aggregates/slt_good_31.slt
@@ -19808,7 +19808,7 @@ SELECT ALL - col2 + col1 - + - col1 FROM tab0
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT COUNT ( * ) AS col1 FROM tab2 WHERE NULL <> - + col2 / - 0
 
 query III rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_38.slt b/data/sqlite/random/aggregates/slt_good_38.slt
@@ -41538,7 +41538,7 @@ SELECT DISTINCT + 13 * + + COUNT ( * ) FROM tab1
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT ALL * FROM tab0, tab1 AS cor0 WHERE - + 22 / - 0 NOT BETWEEN NULL AND NULL
 
 query I rowsort label-6862
diff --git a/data/sqlite/random/aggregates/slt_good_7.slt b/data/sqlite/random/aggregates/slt_good_7.slt
@@ -48189,7 +48189,7 @@ SELECT ALL - col1 + ( 51 ) * + col2 FROM tab1
 4882
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT * FROM tab1 WHERE NOT - col2 / - 0 < ( NULL )
 
 query I rowsort label-7891
diff --git a/data/sqlite/random/aggregates/slt_good_70.slt b/data/sqlite/random/aggregates/slt_good_70.slt
@@ -5275,7 +5275,7 @@ SELECT * FROM tab2 AS cor0 WHERE ( NULL ) NOT IN ( - 76, col0 )
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT * FROM tab0 cor0 WHERE NOT ( NULL ) BETWEEN ( 25 * 22 / ( + - 0 ) + 46 ) AND col0 + col2
 
 query I rowsort label-859
@@ -22413,7 +22413,7 @@ SELECT 80 * + col1 FROM tab0 AS cor0
 80
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT col0 * + col0 FROM tab0 WHERE NOT ( 7 ) / CAST ( col0 - col0 AS INTEGER ) + - col1 >= ( NULL )
 
 query III rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_72.slt b/data/sqlite/random/aggregates/slt_good_72.slt
@@ -1829,7 +1829,7 @@ SELECT COUNT ( - 93 ) + + 27 FROM tab2
 # Postgresql - Postgres error: db error: ERROR: division by zero
 # Datafusion - Datafusion expected results:
 skipif postgres
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT + + col0 * + + col1 / + + 66 FROM tab0 WHERE NULL = + col0 + - 85 / 0
 
 query III rowsort
diff --git a/data/sqlite/random/aggregates/slt_good_73.slt b/data/sqlite/random/aggregates/slt_good_73.slt
@@ -1799,7 +1799,7 @@ SELECT - col1 + + - col1 + + 36 * + col0 AS col1 FROM tab2 AS cor0
 2566
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT * FROM tab2 AS cor0 WHERE NULL <= - CAST ( + col2 AS INTEGER ) / 0
 
 query I rowsort label-298
diff --git a/data/sqlite/random/aggregates/slt_good_81.slt b/data/sqlite/random/aggregates/slt_good_81.slt
@@ -353,7 +353,7 @@ SELECT DISTINCT + - col1 * col0 * + 87 + - col2 + 74 AS col2 FROM tab1 AS cor0
 -62140
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT ALL + 33 * col0 AS col2, col2 + - col1 * - 61 + col0 FROM tab0 AS cor0 WHERE NOT NULL <= - col0 / 0 * + col1
 
 query I rowsort label-53
@@ -27477,7 +27477,7 @@ SELECT DISTINCT 22 AS col1 FROM tab1 AS cor0 WHERE NULL IS NOT NULL
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - col2 * col1 AS col1 FROM tab0 WHERE col2 / - CAST ( col1 / 58 AS INTEGER ) > NULL
 
 query I rowsort label-4532
diff --git a/data/sqlite/random/groupby/slt_good_11.slt b/data/sqlite/random/groupby/slt_good_11.slt
@@ -21268,7 +21268,7 @@ SELECT ALL - + 51 * - col2 + col2 AS col2 FROM tab2 AS cor0 WHERE NOT 48 * + - c
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT ALL ( 19 ) FROM tab0 AS cor0 WHERE NULL BETWEEN + CAST ( + col1 AS INTEGER ) + - - col0 + col2 * - 76 + col1 * - 8 / + col1 * - + col0 / - - col2 AND - col2 + col0 * + + col1 * col2 GROUP BY col2 HAVING NOT ( - ( + ( 44 ) ) ) IS NULL
 
 query I rowsort
diff --git a/data/sqlite/random/groupby/slt_good_12.slt b/data/sqlite/random/groupby/slt_good_12.slt
@@ -12138,7 +12138,7 @@ SELECT - col1 + - col1 AS col1 FROM tab2 WHERE NULL IS NULL GROUP BY col1
 -82
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT col1 AS col1 FROM tab0 WHERE NOT + CASE + 87 WHEN col1 THEN col1 ELSE NULL END NOT BETWEEN - col1 / + col1 AND NULL GROUP BY col1 HAVING NOT col1 * 75 IS NOT NULL
 
 query I rowsort
@@ -14213,7 +14213,7 @@ SELECT ALL - col1 * + col1 * - 34 + - + col1 + ( + col1 ) AS col0 FROM tab0 WHER
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - 78 / - col1 * - 70 * + ( col1 ) * + CAST ( NULL AS INTEGER ) / 40 + + 28 AS col0 FROM tab0 AS cor0 GROUP BY col1, col0, col1 HAVING NULL BETWEEN NULL AND + 29 / + col1 * NULLIF ( col0, + 83 ) + + col1
 
 query I rowsort
@@ -19565,7 +19565,7 @@ SELECT DISTINCT - - CAST ( NULL AS INTEGER ) / - col1 FROM tab1 AS cor0 GROUP BY
 NULL
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT - 84 FROM tab0 AS cor0 WHERE NOT + 96 / + col1 <= NULL GROUP BY col1, col0
 
 query I rowsort
@@ -19639,7 +19639,7 @@ SELECT col1 * - 98 * + 42 FROM tab0 GROUP BY col1 HAVING + col1 IS NULL
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT + 63 col2 FROM tab0 WHERE NOT - - col2 / - - col1 > NULL GROUP BY col1
 
 # Datafusion - Datafusion expected results:
@@ -26970,7 +26970,7 @@ SELECT DISTINCT - + col0 AS col2, col0 / + - col0 FROM tab1 AS cor0 WHERE col2 *
 -1
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - col0 * 87 * - col1 FROM tab0 WHERE NOT col1 BETWEEN 67 + 65 AND - 41 / - col1 + + + col0 * + col1 * col2 / - col0 GROUP BY col1, col0 HAVING NOT col0 IS NOT NULL
 
 query I rowsort
@@ -30764,7 +30764,7 @@ SELECT ALL - COUNT ( * ) + + col1 * 8 FROM tab0 GROUP BY col1 HAVING 69 IS NULL
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT CAST ( NULL AS INTEGER ) / col1 FROM tab0 WHERE NOT ( - 29 ) NOT IN ( + COALESCE ( col2, 1 / - col1 ) ) GROUP BY col1
 
 query I rowsort
@@ -33558,7 +33558,7 @@ SELECT 35 + - col0 FROM tab0 GROUP BY col0, col1
 9
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - - COUNT ( * ) AS col1 FROM tab2 WHERE NOT - col0 NOT BETWEEN ( NULL ) AND col1 * - col0 / + 0 GROUP BY col0
 
 query I rowsort label-5501
@@ -40711,7 +40711,7 @@ SELECT + col2 AS col2 FROM tab2 GROUP BY col2, col2 HAVING NULL = NULL
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - 33 FROM tab0 GROUP BY col0, col1 HAVING NOT - 45 / col1 BETWEEN NULL AND ( NULL )
 
 query I rowsort
@@ -45546,7 +45546,7 @@ SELECT + col0 AS col2 FROM tab1 AS cor0 GROUP BY col0, col0 HAVING NULL <> NULL
 ----
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT col1 FROM tab0 AS cor0 WHERE NULL BETWEEN NULL AND ( CAST ( - col0 AS INTEGER ) ) GROUP BY col2, col1 HAVING NOT col1 / - - col1 IS NULL
 
 query I rowsort
@@ -48796,7 +48796,7 @@ SELECT DISTINCT 62 AS col0 FROM tab0 GROUP BY col1
 62
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT - + CAST ( NULL AS INTEGER ) FROM tab0 AS cor0 WHERE NOT - 16 NOT IN ( - col2 * + + col0 / + 44, - 7 / col1 ) GROUP BY col0, col1 HAVING NOT ( NULL ) NOT BETWEEN NULL AND + col0 + AVG ( + col1 )
 
 query I rowsort label-8026
diff --git a/data/sqlite/random/groupby/slt_good_7.slt b/data/sqlite/random/groupby/slt_good_7.slt
@@ -17938,7 +17938,7 @@ SELECT + - tab0.col0 * + tab0.col0 FROM tab0 GROUP BY col0
 -6889
 
 # Datafusion - Datafusion expected results:
-query error DataFusion error: External error: External error: Arrow error: Divide by zero error
+query error DataFusion error: Arrow error: Divide by zero error
 SELECT DISTINCT tab0.col1 FROM tab0 GROUP BY col1 HAVING NULL = + col1 / tab0.col1
 
 query I rowsort

Original file line number	Diff line number	Diff line change
`@@ -48189,7 +48189,7 @@ SELECT ALL - col1 + ( 51 ) * + col2 FROM tab1`
`48189`	`48189`	`4882`
`48190`	`48190`
`48191`	`48191`	`# Datafusion - Datafusion expected results:`
`48192`		`-query error DataFusion error: External error: External error: Arrow error: Divide by zero error`
	`48192`	`+query error DataFusion error: Arrow error: Divide by zero error`
`48193`	`48193`	`SELECT DISTINCT * FROM tab1 WHERE NOT - col2 / - 0 < ( NULL )`
`48194`	`48194`
`48195`	`48195`	`query I rowsort label-7891`