Changeset: cf3de9a57ed8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cf3de9a57ed8
Modified Files:
sql/server/rel_select.c
sql/test/SQLancer/Tests/sqlancer14.test
Branch: Jul2021
Log Message:
I forgot to disable set queries too
diffs (35 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2714,6 +2714,9 @@ rel_logical_exp(sql_query *query, sql_re
case SQL_EXCEPT:
case SQL_INTERSECT: {
sql_rel *sq;
+
+ if (is_psm_call(f) || is_sql_merge(f))
+ return sql_error(sql, 02, SQLSTATE(42000) "%s: set
operations not supported inside %s", is_psm_call(f) ? "CALL" : "MERGE",
is_psm_call(f) ? "CALL statements" : "MERGE conditions");
if (rel)
query_push_outer(query, rel, f);
sq = rel_setquery(query, sc);
diff --git a/sql/test/SQLancer/Tests/sqlancer14.test
b/sql/test/SQLancer/Tests/sqlancer14.test
--- a/sql/test/SQLancer/Tests/sqlancer14.test
+++ b/sql/test/SQLancer/Tests/sqlancer14.test
@@ -728,3 +728,18 @@ merge into t2 using (select * from t1) a
statement ok
ROLLBACK
+
+statement ok
+START TRANSACTION
+
+statement ok
+CREATE TABLE "t1" ("c0" VARCHAR(64) NOT NULL,"c1" INT NOT NULL,"c3" REAL NOT
NULL,"c5" REAL)
+
+statement ok
+CREATE TABLE "t2" ("c1" INTERVAL MONTH NOT NULL,"c3" VARCHAR(55) NOT NULL,"c4"
DOUBLE NOT NULL, CONSTRAINT "t2_c1_pkey" PRIMARY KEY ("c1"))
+
+statement error MERGE: set operations not supported inside MERGE conditions
+merge into t2 using (select * from t1) as t1 on ((select 1) except (select 2))
when matched then delete
+
+statement ok
+ROLLBACK
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
