Changeset: bdb8b4c9c44d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bdb8b4c9c44d
Modified Files:
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
sql/test/SQLancer/Tests/sqlancer17.test
sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out
sql/test/prepare/Tests/sqlancer_prepare.stable.out
sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
Branch: balanced_union
Log Message:
approved output
diffs (270 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
---
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
+++
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
@@ -81,8 +81,8 @@ project (
| | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | | ) [ "t2606b"."a" NOT NULL UNIQUE ] [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
select * from t2606a union select * from t2606b order by a
@@ -112,8 +112,8 @@ project (
| | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | | ) [ "t2606b"."a" NOT NULL UNIQUE ] [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a union select * from t2606b ) order by a
@@ -143,8 +143,8 @@ project (
| | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | | ) [ "t2606b"."a" NOT NULL UNIQUE ] [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a ) union ( select * from t2606b ) order by a
@@ -170,8 +170,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
select * from t2606a except select * from t2606b order by a
@@ -191,8 +191,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a except select * from t2606b ) order by a
@@ -212,8 +212,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a ) except ( select * from t2606b ) order by a
@@ -233,8 +233,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
select * from t2606a intersect select * from t2606b order by a
@@ -254,8 +254,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a intersect select * from t2606b ) order by a
@@ -275,8 +275,8 @@ project (
| | project (
| | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ]
| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ]
-| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ]
-) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ]
+| ) [ "%1"."a" NOT NULL UNIQUE as "%4"."a" ]
+) [ "%4"."a" NOT NULL UNIQUE ] [ "%4"."a" ASC NOT NULL UNIQUE ]
query I rowsort
( select * from t2606a ) intersect ( select * from t2606b ) order by a
diff --git a/sql/test/SQLancer/Tests/sqlancer17.test
b/sql/test/SQLancer/Tests/sqlancer17.test
--- a/sql/test/SQLancer/Tests/sqlancer17.test
+++ b/sql/test/SQLancer/Tests/sqlancer17.test
@@ -80,7 +80,7 @@ project (
| | | | ) [ ("%6"."%6" NOT NULL) ! <= (tinyint(3) "1") ! <= ("%6"."%6" NOT
NULL), (tinyint(3) "3") <= ("%6"."%6" NOT NULL) <= (tinyint(3) "5") ]
| | | ) [ "%6"."%6" NOT NULL as "v0"."vc0" ]
| | ) [ "v0"."vc0" NOT NULL ]
-| ) [ "sys"."sql_max"(tinyint(1) "1", tinyint(1) "1") NOT NULL as "%20"."%20" ]
+| ) [ "sys"."sql_max"(tinyint(1) "1", tinyint(1) "1") NOT NULL as "%17"."%17" ]
) [ tinyint(1) "1" ]
statement ok
diff --git a/sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
b/sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
--- a/sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
+++ b/sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
@@ -45,7 +45,7 @@ stdout of test 'limit_in_prepare.Bug-255
[ "int", 32, 0, "", "rr", "id" ]
[ "bigint", 64, 0, NULL, NULL, NULL ]
#exec 5 (1);
-% sys.rr # table_name
+% .rr # table_name
% id # name
% int # type
% 1 # length
diff --git a/sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out
b/sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out
--- a/sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out
+++ b/sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out
@@ -34,8 +34,8 @@ stdout of test 'rename_exps.Bug-3974` in
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
-% 6, 2, 1, 0, 3, 3 # length
-[ "bigint", 64, 0, "", "%10", "%10" ]
+% 6, 2, 1, 0, 2, 2 # length
+[ "bigint", 64, 0, "", "%7", "%7" ]
#drop table foo;
# 12:27:17 >
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
@@ -10,9 +10,9 @@
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
-% 12, 2, 1, 0, 3, 2 # length
-[ "boolean", 1, 0, "", "%10", "c0" ]
-[ "sec_interval", 13, 0, "", "%10", "%1" ]
+% 12, 2, 1, 0, 2, 2 # length
+[ "boolean", 1, 0, "", "%7", "c0" ]
+[ "sec_interval", 13, 0, "", "%7", "%1" ]
[ "boolean", 1, 0, NULL, NULL, NULL ]
[ "sec_interval", 13, 0, NULL, NULL, NULL ]
#ROLLBACK;
@@ -28,8 +28,8 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 7, 2, 1, 0, 3, 3 # length
-[ "decimal", 2, 1, "", "%22", "%13" ]
-[ "int", 32, 0, "", "%22", "c2" ]
+[ "decimal", 2, 1, "", "%20", "%12" ]
+[ "int", 32, 0, "", "%20", "c2" ]
[ "decimal", 2, 1, NULL, NULL, NULL ]
[ "int", 32, 0, NULL, NULL, NULL ]
[ "int", 32, 0, NULL, NULL, NULL ]
@@ -75,7 +75,7 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 3, 2 # length
-[ "bigint", 64, 0, "", "%12", "%4" ]
+[ "bigint", 64, 0, "", "%11", "%4" ]
[ "char", 0, 0, NULL, NULL, NULL ]
[ "bigint", 64, 0, NULL, NULL, NULL ]
#PREPARE VALUES (CASE WHEN true THEN 5 BETWEEN 4 AND 2 END);
@@ -153,23 +153,23 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 4, 1, 1, 0, 3, 3 # length
-[ "json", 0, 0, "", "%15", "%15" ]
+[ "json", 0, 0, "", "%14", "%14" ]
[ "clob", 0, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 4, 1, 1, 0, 3, 3 # length
-[ "json", 0, 0, "", "%15", "%15" ]
+[ "json", 0, 0, "", "%14", "%14" ]
[ "clob", 0, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 7, 1, 1, 0, 3, 3 # length
-[ "char", 1, 0, "", "%22", "%14" ]
+[ "char", 1, 0, "", "%20", "%13" ]
[ "char", 1, 0, NULL, NULL, NULL ]
[ "boolean", 1, 0, NULL, NULL, NULL ]
-% .%22 # table_name
-% %14 # name
+% .%20 # table_name
+% %13 # name
% char # type
% 1 # length
[ "b" ]
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
@@ -10,9 +10,9 @@
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
-% 12, 2, 1, 0, 3, 2 # length
-[ "boolean", 1, 0, "", "%10", "c0" ]
-[ "sec_interval", 13, 0, "", "%10", "%1" ]
+% 12, 2, 1, 0, 2, 2 # length
+[ "boolean", 1, 0, "", "%7", "c0" ]
+[ "sec_interval", 13, 0, "", "%7", "%1" ]
[ "boolean", 1, 0, NULL, NULL, NULL ]
[ "sec_interval", 13, 0, NULL, NULL, NULL ]
#ROLLBACK;
@@ -28,8 +28,8 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 7, 2, 1, 0, 3, 3 # length
-[ "decimal", 2, 1, "", "%22", "%13" ]
-[ "int", 32, 0, "", "%22", "c2" ]
+[ "decimal", 2, 1, "", "%20", "%12" ]
+[ "int", 32, 0, "", "%20", "c2" ]
[ "decimal", 2, 1, NULL, NULL, NULL ]
[ "int", 32, 0, NULL, NULL, NULL ]
[ "int", 32, 0, NULL, NULL, NULL ]
@@ -75,7 +75,7 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 6, 2, 1, 0, 3, 2 # length
-[ "bigint", 64, 0, "", "%12", "%4" ]
+[ "bigint", 64, 0, "", "%11", "%4" ]
[ "char", 0, 0, NULL, NULL, NULL ]
[ "bigint", 64, 0, NULL, NULL, NULL ]
#PREPARE VALUES (CASE WHEN true THEN 5 BETWEEN 4 AND 2 END);
@@ -153,23 +153,23 @@
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 4, 1, 1, 0, 3, 3 # length
-[ "json", 0, 0, "", "%15", "%15" ]
+[ "json", 0, 0, "", "%14", "%14" ]
[ "clob", 0, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 4, 1, 1, 0, 3, 3 # length
-[ "json", 0, 0, "", "%15", "%15" ]
+[ "json", 0, 0, "", "%14", "%14" ]
[ "clob", 0, 0, NULL, NULL, NULL ]
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
% 7, 1, 1, 0, 3, 3 # length
-[ "char", 1, 0, "", "%22", "%14" ]
+[ "char", 1, 0, "", "%20", "%13" ]
[ "char", 1, 0, NULL, NULL, NULL ]
[ "boolean", 1, 0, NULL, NULL, NULL ]
-% .%22 # table_name
-% %14 # name
+% .%20 # table_name
+% %13 # name
% char # type
% 1 # length
[ "b" ]
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
