Changeset: 88d63d4d5eb6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/88d63d4d5eb6
Modified Files:
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.test
sql/test/SQLancer/Tests/sqlancer22.test
sql/test/subquery/Tests/subquery3.test
sql/test/subquery/Tests/subquery6.test
Branch: default
Log Message:
use the new sqllogictest 'slashes' feature to filter out the main err. msg.
but ignore the issuing function name
diffs (290 lines):
diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.test
b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.test
--- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.test
+++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.test
@@ -26,7 +26,7 @@ SELECT * FROM (SELECT * FROM tmp) AS A
1
2
-statement error
+statement error /more than one match/
SELECT (SELECT * FROM groupElements(pivot.x))
FROM (SELECT * FROM tmp) as pivot
diff --git a/sql/test/SQLancer/Tests/sqlancer22.test
b/sql/test/SQLancer/Tests/sqlancer22.test
--- a/sql/test/SQLancer/Tests/sqlancer22.test
+++ b/sql/test/SQLancer/Tests/sqlancer22.test
@@ -98,34 +98,34 @@ select max(((select mct20.c0) union all
statement ok rowcount 1
INSERT INTO mct20 VALUES (INTERVAL '1' DAY, DATE '2010-01-01')
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select 1 from mct20 where ((select true) union all (select true))
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select 1 from mct20 inner join (select x.x from (values (true)) x(x)) as
nort0(norc0)
on true and greatest(((select nort0.norc0) union all (select true)), true)
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select 1 from mct20 inner join (select x.x from (values (true)) x(x)) as
nort0(norc0)
on ((select nort0.norc0) union all (select true))
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select 1 from mct20 inner join (select x.x from (values (true)) x(x)) as
nort0(norc0)
on true where ((select nort0.norc0) union all (select true))
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select rank() over (order by ((select mct20.c0) union all (select interval '1'
day))) from mct20
----
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select sum(((select mct20.c0) union all (select interval '1' day))) over ()
from mct20
----
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select sum(((select interval '2' day) union all (select interval '1' day)))
over () from mct20
----
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
select max(((select mct20.c0) union all (select interval '1' day))) over ()
from mct20
----
@@ -798,9 +798,9 @@ select 1 where (2,3) in (select 2 union
statement error SELECT: subquery must return only one column
select 1 where (2) in (with x(x,y) as (select 2,3) select x,y from x)
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select x FROM (VALUES (1),(2),(3)) x(x) where ((select 3 union all select 3))
in (select 3)
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select x FROM (VALUES (1),(2),(3)) x(x) where (2, (select 3 union all select
3)) in (select 2,3)
diff --git a/sql/test/subquery/Tests/subquery3.test
b/sql/test/subquery/Tests/subquery3.test
--- a/sql/test/subquery/Tests/subquery3.test
+++ b/sql/test/subquery/Tests/subquery3.test
@@ -123,7 +123,7 @@ FROM another_T t1
----
1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT AVG(col1) OVER (PARTITION BY col5 ORDER BY col1 ROWS UNBOUNDED
PRECEDING) FROM tbl_ProductSales)
FROM another_T t1
@@ -134,18 +134,18 @@ SELECT
FROM another_T t1
GROUP BY col1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT SUM(SUM(col2)) OVER (PARTITION BY SUM(col2) ORDER BY MAX(col2)
ROWS UNBOUNDED PRECEDING) FROM tbl_ProductSales)
FROM another_T t1
GROUP BY col1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT DENSE_RANK() OVER (PARTITION BY col5 ORDER BY col1) FROM
tbl_ProductSales)
FROM another_T t1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT DENSE_RANK() OVER (PARTITION BY MIN(col5) ORDER BY MAX(col8)) FROM
tbl_ProductSales)
FROM another_T t1
@@ -157,7 +157,7 @@ SELECT
FROM another_T t1
GROUP BY col6
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT t2.col1 * SUM(SUM(t1.col2)) OVER (PARTITION BY SUM(t1.col2) ORDER
BY MAX(t1.col1) ROWS UNBOUNDED PRECEDING) FROM another_T t2)
FROM another_T t1
@@ -466,7 +466,7 @@ 2
3
NULL
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
SELECT
MIN(i1.i)
FROM integers i1
@@ -477,12 +477,12 @@ SELECT
(SELECT SUM(t1.col1) OVER (PARTITION BY (VALUES(1)) ROWS UNBOUNDED
PRECEDING) FROM tbl_ProductSales)
FROM another_T t1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT SUM(t1.col1) OVER (ORDER BY (VALUES(1)) ROWS UNBOUNDED PRECEDING)
FROM tbl_ProductSales)
FROM another_T t1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT SUM(t1.col1) OVER (ORDER BY (SELECT SUM(t1.col1 + t2.col1) FROM
another_T t2) ROWS UNBOUNDED PRECEDING) FROM tbl_ProductSales)
FROM another_T t1
@@ -555,7 +555,7 @@ SELECT
(SELECT 1 FROM integers i2 INNER JOIN integers i3 on MAX(i3.i) =
MIN(i2.i))
FROM integers i1
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT SUM(SUM(i1.i) + i2.i) FROM integers i2 GROUP BY i2.i)
FROM integers i1
@@ -690,12 +690,12 @@ 11
111
1111
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT col1 FROM tbl_ProductSales)))
FROM another_T
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT t2.col1 FROM another_T t2)))
FROM another_T
@@ -717,7 +717,7 @@ 4
4
4
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT MAX(t1.col1) FROM
tbl_ProductSales)))
FROM another_T t1
@@ -741,22 +741,22 @@ SELECT * FROM evilfunction(1)
1
1
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT MIN(col1))))
FROM another_T
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT MAX(ColID) FROM
tbl_ProductSales)))
FROM another_T
-statement error GDK reported error: selectjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT MAX(t1.col1) FROM
tbl_ProductSales)))
FROM another_T t1
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
SELECT
(SELECT outt FROM evilfunction((SELECT MIN(t2.col1) FROM another_T t2)))
FROM another_T
@@ -802,12 +802,12 @@ 1
1
1
-statement error GDK reported error: hashjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT i2.i FROM (VALUES (i1.i), (i1.i)) as i2(i))
FROM integers i1
-statement error GDK reported error: hashjoin: more than one match
+statement error /more than one match/
SELECT
(SELECT i2.i FROM (VALUES (i1.i, i1.i), (i1.i, i1.i)) as i2(i,j))
FROM integers i1
diff --git a/sql/test/subquery/Tests/subquery6.test
b/sql/test/subquery/Tests/subquery6.test
--- a/sql/test/subquery/Tests/subquery6.test
+++ b/sql/test/subquery/Tests/subquery6.test
@@ -16,19 +16,19 @@ CREATE TABLE integers(i INTEGER)
statement ok rowcount 4
INSERT INTO integers VALUES (1), (2), (3), (NULL)
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
DELETE FROM another_t WHERE (SELECT 1 UNION SELECT 2) > 1
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
DELETE FROM another_t WHERE (SELECT 1 UNION SELECT 2) > 1
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
UPDATE another_T SET col1 = 1 WHERE (SELECT 1 UNION SELECT 2) > 1
statement error 42000!MERGE: subqueries not supported inside MERGE conditions
MERGE INTO another_t USING (SELECT col1 FROM another_t) sub ON (SELECT 1 UNION
SELECT 2) > 1 WHEN MATCHED THEN DELETE WHEN NOT MATCHED THEN INSERT
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
MERGE INTO another_t USING (SELECT (SELECT 1 UNION SELECT 2) FROM another_t)
sub ON TRUE WHEN MATCHED THEN DELETE WHEN NOT MATCHED THEN INSERT
query I rowsort
@@ -183,13 +183,13 @@ 22
222
2222
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT (SELECT t2.col2 FROM another_t t2 WHERE t2.col1 BETWEEN t1.col1 AND
t2.col2) FROM another_t t1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
SELECT (SELECT t2.col2 FROM another_t t2 WHERE t2.col1 BETWEEN t2.col1 AND
t1.col2) FROM another_t t1
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
SELECT 1 > (SELECT 2 FROM integers)
query I rowsort
@@ -431,16 +431,16 @@ select (select i2.i in (select sum(i1.i
statement error 42000!SELECT: cannot use non GROUP BY column 'i2.i' in query
results without an aggregate function
select (select i2.i in (select sum(i1.i + i2.i)) from integers i2) from
integers i1 group by i1.i
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
select (select i2.i in (select sum(i1.i + i2.i)) from integers i2 group by
i2.i) from integers i1
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
select (select i2.i in (select sum(i1.i + i2.i)) from integers i2 group by
i2.i) from integers i1 group by i1.i
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
select (select sum(i2.i) in (select sum(i1.i + i2.i)) from integers i2 group
by i2.i) from integers i1 group by i1.i
-statement error GDK reported error: mergejoin: more than one match
+statement error /more than one match/
select (select sum(i1.i + i2.i) in (select sum(i1.i + i2.i)) from integers i2
group by i2.i) from integers i1 group by i1.i
query I rowsort
@@ -499,10 +499,10 @@ 0
0
0
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select 1 where (select 1 union all select 2) in (1)
-statement error GDK reported error: BATsubcross: more than one match
+statement error /more than one match/
select (select 1 union all select 2) in (1)
statement ok
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
