Changeset: 22f7e188e2b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22f7e188e2b8
Modified Files:
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err
sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out
Branch: sq2default
Log Message:
approved output
diffs (143 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
b/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
---
a/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
+++
b/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
@@ -136,14 +136,14 @@ stdout of test 'DISTINCT_with_correlated
#2399|150|0
[ 3416 ]
#SELECT COUNT(*) FROM sys."functions_cpy";
-% .L3 # table_name
-% L3 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 4 # length
[ 1167 ]
#SELECT COUNT(*) FROM sys."args_cpy";
-% .L3 # table_name
-% L3 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 4 # length
[ 3416 ]
@@ -151,7 +151,7 @@ stdout of test 'DISTINCT_with_correlated
#, CAST((SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS smallint) AS
"PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% sys.L2, sys.L4, .L12, sys.L15 # table_name
+% .schemas, .functions_cpy, ., . # table_name
% PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE, SPECIFIC_NAME # name
% varchar, varchar, smallint, varchar # type
% 3, 16, 1, 20 # length
@@ -168,7 +168,7 @@ stdout of test 'DISTINCT_with_correlated
#, CAST((SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS smallint) AS
"PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L15, sys.L20 # table_name
+% ., .schemas, .functions_cpy, ., . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, smallint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -185,7 +185,7 @@ stdout of test 'DISTINCT_with_correlated
#, CAST((SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS smallint) AS
"PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L15, sys.L20 # table_name
+% ., .schemas, .functions_cpy, ., . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, smallint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -202,7 +202,7 @@ stdout of test 'DISTINCT_with_correlated
#, CAST((SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS smallint) AS
"PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L15, sys.L20 # table_name
+% ., .schemas, .functions_cpy, ., . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, smallint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -216,7 +216,7 @@ stdout of test 'DISTINCT_with_correlated
#, CAST((SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS smallint) AS
"PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L15, sys.L20 # table_name
+% ., .schemas, .functions_cpy, ., . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, smallint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -230,7 +230,7 @@ stdout of test 'DISTINCT_with_correlated
#, (SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS "PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L14, sys.L17 # table_name
+% ., .schemas, .functions_cpy, .%2, . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, bigint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -244,7 +244,7 @@ stdout of test 'DISTINCT_with_correlated
#, (SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS "PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L14, sys.L17 # table_name
+% ., .schemas, .functions_cpy, .%2, . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, bigint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -258,7 +258,7 @@ stdout of test 'DISTINCT_with_correlated
#, (SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS "PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L14, sys.L17 # table_name
+% ., .schemas, .functions_cpy, .%2, . # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, bigint, varchar # type
% 1, 3, 16, 1, 20 # length
@@ -272,7 +272,7 @@ stdout of test 'DISTINCT_with_correlated
#, (SELECT COUNT(*) FROM "sys"."args_cpy" where "args_cpy"."func_id" =
"functions_cpy"."id" and "args_cpy"."number" = 0) AS "PROCEDURE_TYPE"
#, CAST(CASE "functions_cpy"."language" WHEN 0 THEN "functions_cpy"."mod" ||
'.' || "functions_cpy"."func" ELSE "schemas"."name" || '.' ||
"functions_cpy"."name" END AS VARCHAR(1500)) AS "SPECIFIC_NAME"
#FROM "sys"."functions_cpy", "sys"."schemas" WHERE "functions_cpy"."schema_id"
= "schemas"."id"
-% .L3, sys.L5, sys.L7, .L14, sys.L17 # table_name
+% .%30, .%31, .%32, .%33, .%34 # table_name
% PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME, PROCEDURE_TYPE,
SPECIFIC_NAME # name
% char, varchar, varchar, bigint, varchar # type
% 1, 3, 16, 1, 20 # length
diff --git
a/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err
b/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err
--- a/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err
+++ b/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err
@@ -27,6 +27,17 @@ stderr of test 'groupby_assertion.Bug-63
# 16:45:11 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16821" "--port=39210"
# 16:45:11 >
+MAPI = (monetdb) /var/tmp/mtest-31432/.s.monetdb.38083
+QUERY = insert into source_attr select 'src_0',
+ (select count(*) from source_attr where sat_id =
'source_ac_0'),
+ c.name,c.name,
+ (select count(*) from source_ac_0 where c.name is null),
+ (select count(distinct c.name) from source_ac_0),
+ c.type,null
+ from sys.tables as T, sys.columns as C
+ where T.id = C.table_id and T.name = 'source_ac_0';
+ERROR = !SELECT: no such column 'c.type'
+CODE = 42S22
# 16:45:11 >
# 16:45:11 > "Done."
diff --git
a/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out
b/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out
--- a/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out
+++ b/sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out
@@ -55,15 +55,6 @@ stdout of test 'groupby_assertion.Bug-63
[ 4, 5, 8 ]
#INSERT INTO sources VALUES ('src_0', 'ac_0', 'source_ac_0', 'source_ac_0',
(select count(*) from source_ac_0), '',now());
[ 1 ]
-#insert into source_attr select 'src_0',
-# (select count(*) from source_attr where sat_id = 'source_ac_0'),
-# c.name,c.name,
-# (select count(*) from source_ac_0 where c.name is null),
-# (select count(distinct c.name) from source_ac_0),
-# c.type,null
-# from sys.tables as T, sys.columns as C
-# where T.id = C.table_id and T.name = 'source_ac_0';
-[ 3 ]
# 16:45:11 >
# 16:45:11 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
