Changeset: d55017098503 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d55017098503
Removed Files:
sql/test/miscellaneous/Tests/prepare.stable.out.int128
Modified Files:
sql/test/SQLancer/Tests/sqlancer04.sql
sql/test/SQLancer/Tests/sqlancer04.stable.err
sql/test/SQLancer/Tests/sqlancer04.stable.out
sql/test/miscellaneous/Tests/prepare.stable.err
sql/test/miscellaneous/Tests/prepare.stable.out
Branch: typing
Log Message:
Approved output
diffs (136 lines):
diff --git a/sql/test/SQLancer/Tests/sqlancer04.sql
b/sql/test/SQLancer/Tests/sqlancer04.sql
--- a/sql/test/SQLancer/Tests/sqlancer04.sql
+++ b/sql/test/SQLancer/Tests/sqlancer04.sql
@@ -21,7 +21,7 @@ UNION ALL SELECT ALL SUM(ALL 0.128300071
HAVING (MIN(ALL ((r'946496923')LIKE(CAST(nullif(0.5, 0.03) AS STRING(538))))))
IS NULL;
ROLLBACK;
-SELECT covar_samp(1, - (COALESCE(1, 2)||5)); --error on default, covar_samp
between integer and string not possible
+SELECT covar_samp(1, - (COALESCE(1, 2)||5));
START TRANSACTION;
CREATE TABLE "sys"."t0"("c0" DATE, "c1" DATE, "c2" INTERVAL SECOND NOT
NULL,"c3" TIME NOT NULL);
@@ -39,7 +39,7 @@ else coalesce (case coalesce (dayofmonth
cast(t0.c3 as double)) then case least(t0.c1, t0.c1) when case t0.c2 when
interval '5' month then r'*pf6/+}öq壚,j2\302\205K]sNKk,_%Tu' when 1016331084
then r'0.4'
else r'*' end then 0.8 end when sql_min(t0.c3, t0.c3) then coalesce
(cast(t0.c2 as decimal), "second"(t0.c3), cast(t0.c2 as decimal),
0.9) when coalesce (cast(t0.c1 as double), 0.2) then 0.0 else 0.0 end, 0.2)
end from t0 where (interval '6' month)
-is not null group by cast(dayofmonth(t0.c0) as string(679)), 0.2; --error, on
Jun2020 t0.c0 is not aggregated, on default
+is not null group by cast(dayofmonth(t0.c0) as string(679)), 0.2; --error,
types sec_interval(0,0) and tinyint(8,0) are not equal
ROLLBACK;
START TRANSACTION;
diff --git a/sql/test/SQLancer/Tests/sqlancer04.stable.err
b/sql/test/SQLancer/Tests/sqlancer04.stable.err
--- a/sql/test/SQLancer/Tests/sqlancer04.stable.err
+++ b/sql/test/SQLancer/Tests/sqlancer04.stable.err
@@ -5,18 +5,14 @@ stderr of test 'sqlancer04` in directory
# 09:44:50 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-36890" "--port=30177"
# 09:44:50 >
-MAPI = (monetdb) /var/tmp/mtest-394778/.s.monetdb.37947
-QUERY = SELECT covar_samp(1, - (COALESCE(1, 2)||5)); --error on default,
covar_samp between integer and string not possible
-ERROR = !types sec_interval(0,0) and tinyint(8,0) are not equal
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-394778/.s.monetdb.37947
+MAPI = (monetdb) /var/tmp/mtest-456805/.s.monetdb.38274
QUERY = select case covar_samp(all - (coalesce (cast(-5 as int), coalesce
(((cast(0.4 as int))-(coalesce (5, 5))), +
(case -3 when 0.5 then 5 else 3 end)))), - (- (((coalesce (cast(0.2 as
int),
coalesce (5, 3, -747176383), ((6)%(3)), ((-2)<<(3))))||(-5))))) when
case t0.c0 when
case coalesce (coalesce (0.2, 0.3, 0.7), 0.5,
cast(t0.c2 as decimal)) when cast(interval '-4' month as interval
second) then cast(case 0.3 when t0.c1 then 0.6
when interval '-3' month then 0.3 end as interval second) end then
coalesce (abs(0.6),
-ERROR = !types sec_interval(0,0) and tinyint(8,0) are not equal
+ERROR = !SELECT: cannot use non GROUP BY column 't0.c0' in query results
without an aggregate function
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-394778/.s.monetdb.37947
QUERY = SELECT CASE '5'^3 WHEN COUNT(TRUE) THEN 1 END FROM t0 GROUP BY 2 IN
((CAST(INTERVAL '-2' SECOND AS INT))%2); --error on default: types
sec_interval(13,0) and int(32,0) are not equal
diff --git a/sql/test/SQLancer/Tests/sqlancer04.stable.out
b/sql/test/SQLancer/Tests/sqlancer04.stable.out
--- a/sql/test/SQLancer/Tests/sqlancer04.stable.out
+++ b/sql/test/SQLancer/Tests/sqlancer04.stable.out
@@ -29,6 +29,12 @@ stdout of test 'sqlancer04` in directory
% double # type
% 24 # length
#ROLLBACK;
+#SELECT covar_samp(1, - (COALESCE(1, 2)||5));
+% .%1 # table_name
+% %1 # name
+% double # type
+% 24 # length
+[ NULL ]
#START TRANSACTION;
#CREATE TABLE "sys"."t0"("c0" DATE, "c1" DATE, "c2" INTERVAL SECOND NOT
NULL,"c3" TIME NOT NULL);
#ROLLBACK;
diff --git a/sql/test/miscellaneous/Tests/prepare.stable.err
b/sql/test/miscellaneous/Tests/prepare.stable.err
--- a/sql/test/miscellaneous/Tests/prepare.stable.err
+++ b/sql/test/miscellaneous/Tests/prepare.stable.err
@@ -5,6 +5,14 @@ stderr of test 'prepare` in directory 's
# 15:48:36 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-461643" "--port=32495"
# 15:48:36 >
+MAPI = (monetdb) /var/tmp/mtest-457890/.s.monetdb.36218
+QUERY = prepare select 1=?+?;
+ERROR = !types tinyint(1,0) and month_interval(3,0) are not equal
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-457890/.s.monetdb.36218
+QUERY = exec 0 (1,0);
+ERROR = !EXEC: PREPARED Statement missing '0'
+CODE = 42000
# 15:48:36 >
# 15:48:36 > "Done."
diff --git a/sql/test/miscellaneous/Tests/prepare.stable.out
b/sql/test/miscellaneous/Tests/prepare.stable.out
--- a/sql/test/miscellaneous/Tests/prepare.stable.out
+++ b/sql/test/miscellaneous/Tests/prepare.stable.out
@@ -5,21 +5,6 @@ stdout of test 'prepare` in directory 's
# 15:48:36 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-461643" "--port=32495"
# 15:48:36 >
-#prepare select 1=?+?;
-#prepare select 1=?+?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 7, 2, 1, 0, 2, 2 # length
-[ "boolean", 1, 0, "", "%2", "%2" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
-#exec 0 (1,0);
-% .%2 # table_name
-% %2 # name
-% boolean # type
-% 5 # length
-[ true ]
# 15:48:36 >
# 15:48:36 > "Done."
diff --git a/sql/test/miscellaneous/Tests/prepare.stable.out.int128
b/sql/test/miscellaneous/Tests/prepare.stable.out.int128
deleted file mode 100644
--- a/sql/test/miscellaneous/Tests/prepare.stable.out.int128
+++ /dev/null
@@ -1,27 +0,0 @@
-stdout of test 'prepare` in directory 'sql/test/miscellaneous` itself:
-
-
-# 15:48:36 >
-# 15:48:36 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-461643" "--port=32495"
-# 15:48:36 >
-
-#prepare select 1=?+?;
-#prepare select 1=?+?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 7, 3, 1, 0, 2, 2 # length
-[ "boolean", 1, 0, "", "%2", "%2" ]
-[ "hugeint", 128, 0, NULL, NULL, NULL ]
-[ "hugeint", 128, 0, NULL, NULL, NULL ]
-#exec 0 (1,0);
-% .%2 # table_name
-% %2 # name
-% boolean # type
-% 5 # length
-[ true ]
-
-# 15:48:36 >
-# 15:48:36 > "Done."
-# 15:48:36 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
