Changeset: 58e8ae403a28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58e8ae403a28
Modified Files:
sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
Branch: sciql
Log Message:
approved some expected stable output
diffs (truncated from 342 to 300 lines):
diff --git
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
---
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
+++
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
@@ -31,10 +31,10 @@ Ready.
# AND "tables"."schema_id" = "schemas"."id"
# AND "tables"."system" = FALSE
# AND "keys"."type" = 0;
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .schemas, .schemas,
.schemas, .schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary, id, name,
authorization, owner # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, boolean, int,
tinyint, int, varchar, int, int # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 5, 5, 1, 1,
1, 0, 1, 1 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas #
table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action,
readonly, temporary, id, name, authorization, owner # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, tinyint, int,
varchar, int, int # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 5, 1, 1, 0,
1, 1 # length
#SELECT *
#FROM "keys", "objects", "tables", "schemas"
#WHERE "keys"."id" = "objects"."id"
@@ -43,12 +43,12 @@ Ready.
# AND "tables"."system" = FALSE
# AND "keys"."type" = 0
#ORDER BY "objects"."name";
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .schemas, .schemas,
.schemas, .schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary, id, name,
authorization, owner # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, boolean, int,
tinyint, int, varchar, int, int # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 5, 5, 1, 1,
1, 0, 1, 1 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas #
table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action,
readonly, temporary, id, name, authorization, owner # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, tinyint, int,
varchar, int, int # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 5, 1, 1, 0,
1, 1 # length
-# 21:34:14 >
-# 21:34:14 > "Done."
-# 21:34:14 >
+# 19:00:10 >
+# 19:00:10 > "Done."
+# 19:00:10 >
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -84,7 +84,7 @@ stderr of test 'sql_command_kills_db.SF-
MAPI = monetdb@madrid:36834
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (37>1)
+ERROR = !cardinality violation (41>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
--- a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
+++ b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
@@ -28,20 +28,20 @@ Ready.
[ 1 ]
[ 1 ]
#select * from tables, x limit 10;
-% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, sys.x, sys.x # table_name
-% id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary, n, s # name
-% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint, int,
varchar # type
-% 4, 9, 4, 0, 1, 5, 1, 5, 5, 1,
1, 1, 5 # length
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
false, 0, 0, 2, "two" ]
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
false, 0, 0, 3, "three" ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
false, 0, 0, 2, "two" ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
false, 0, 0, 3, "three" ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
false, 0, 0, 2, "two" ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
false, 0, 0, 3, "three" ]
-[ 2024, "args", 2000, NULL, 0, true, 0, false, false,
0, 0, 1, "one" ]
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, sys.x, sys.x #
table_name
+% id, name, schema_id, query, type, system, commit_action,
readonly, temporary, n, s # name
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint, int, varchar # type
+% 4, 9, 4, 0, 1, 5, 1, 5, 1, 1,
5 # length
+[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
+[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0, 2, "two" ]
+[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0, 3, "three" ]
+[ 2006, "types", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
+[ 2006, "types", 2000, NULL, 0, true, 0, false,
0, 2, "two" ]
+[ 2006, "types", 2000, NULL, 0, true, 0, false,
0, 3, "three" ]
+[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
+[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0, 2, "two" ]
+[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0, 3, "three" ]
+[ 2024, "args", 2000, NULL, 0, true, 0, false, 0,
1, "one" ]
#drop table x cascade;
# 18:40:33 >
diff --git
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
--- a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
+++ b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
@@ -26,17 +26,17 @@ Ready.
# 09:37:07 >
#SELECT * from tables OFFSET 2147483647; -- never finishes
-% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables # table_name
-% id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary # name
-% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
-% 1, 0, 1, 0, 1, 5, 1, 5, 5, 1,
1 # length
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
+% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
+% 1, 0, 1, 0, 1, 5, 1, 5, 1 # length
#SELECT * from tables OFFSET 2147483646; -- returns instantly
-% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables # table_name
-% id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary # name
-% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
-% 1, 0, 1, 0, 1, 5, 1, 5, 5, 1,
1 # length
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
+% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
+% 1, 0, 1, 0, 1, 5, 1, 5, 1 # length
-# 18:45:19 >
-# 18:45:19 > "Done."
-# 18:45:19 >
+# 19:07:19 >
+# 19:07:19 > "Done."
+# 19:07:19 >
diff --git
a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
--- a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
+++ b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
@@ -29,19 +29,19 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 36 ]
+[ 40 ]
#select count(distinct name) from tables;
% .tables # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 29 ]
+[ 32 ]
#select count(name) , count(distinct name) from tables;
% .tables, .tables # table_name
% L1, L2 # name
% wrd, wrd # type
% 2, 2 # length
-[ 36, 29 ]
+[ 40, 32 ]
# 10:05:42 >
# 10:05:42 > Done.
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
---
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
@@ -28,13 +28,13 @@ Ready.
% L2, L1 # name
% tinyint, wrd # type
% 1, 2 # length
-[ 1, 37 ]
+[ 1, 40 ]
#SELECT (SELECT count(*) FROM tables), 1;
% .tables, . # table_name
% L1, single_value # name
% wrd, tinyint # type
% 2, 1 # length
-[ 37, 1 ]
+[ 40, 1 ]
# 21:48:51 >
# 21:48:51 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -24,47 +24,51 @@ Ready.
# 18:53:13 >
#select * from tables where 1;
-% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables # table_name
-% id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary # name
-% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
-% 4, 15, 4, 292, 1, 5, 1, 5, 5, 1,
1 # length
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2024, "args", 2000, NULL, 0, true, 0, false, false,
0, 0 ]
-[ 2032, "sequences", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2042, "dependencies", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2046, "connections", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2066, "_columns", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2077, "_dimensions", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2082, "keys", 2000, NULL, 0, true, 0, false, false,
0, 0 ]
-[ 2089, "idxs", 2000, NULL, 0, true, 0, false, false,
0, 0 ]
-[ 2094, "triggers", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2105, "objects", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 2110, "_tables", 2109, NULL, 0, true, 2, false,
false, 0, 0 ]
-[ 2121, "_columns", 2109, NULL, 0, true, 2, false,
false, 0, 0 ]
-[ 2132, "_dimensions", 2109, NULL, 0, true, 2, false,
false, 0, 0 ]
-[ 2137, "keys", 2109, NULL, 0, true, 2, false, false,
0, 0 ]
-[ 2144, "idxs", 2109, NULL, 0, true, 2, false, false,
0, 0 ]
-[ 2149, "triggers", 2109, NULL, 0, true, 2, false,
false, 0, 0 ]
-[ 2160, "objects", 2109, NULL, 0, true, 2, false,
false, 0, 0 ]
-[ 5007, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS
\"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS
\"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;",
1, true, 0, false, false, 0, 0 ]
-[ 5019, "columns", 2000, "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, false, false, 0, 0 ]
-[ 5030, "arrays", 2000, "SELECT * FROM (SELECT p.*, 0 AS
\"temporary\" FROM \"sys\".\"_tables\" AS p WHERE nr_dimensions > 0 UNION ALL
SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t WHERE
nr_dimensions > 0) AS arrays;", 1, true, 0, false, false,
0, 0 ]
-[ 5042, "dimensions", 2000, "SELECT * FROM (SELECT pc.*,
\"pd\".\"start\", pd.step, pd.stop FROM \"sys\".\"_columns\" AS pc,
\"sys\".\"_dimensions\" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*,
\"td\".\"start\", td.step, td.stop FROM \"tmp\".\"_columns\" AS tc,
\"tmp\".\"_dimensions\" AS td WHERE tc.id = td.column_id) AS dimensions;", 1,
true, 0, false, false, 0, 0 ]
-[ 5065, "db_user_info", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5073, "users", 2000, "SELECT u.\"name\" AS \"name\",
ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN
\"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true,
0, false, false, 0, 0 ]
-[ 5077, "user_role", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5080, "auths", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5084, "privileges", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5237, "queryhistory", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5251, "callhistory", 2000, NULL, 0, true, 0, false,
false, 0, 0 ]
-[ 5268, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, false, 0, 0 ]
-[ 6034, "storagemodelinput", 2000, NULL, 0, true, 0,
false, false, 0, 0 ]
-[ 6075, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, false, 0, 0 ]
-[ 7024, "systemfunctions", 2000, NULL, 0, true, 0,
false, false, 0, 0 ]
-[ 7133, "r", 2000, NULL, 0, false, 0, false, false,
0, 0 ]
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
+% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
+% 4, 17, 4, 488, 1, 5, 1, 5, 1 # length
+[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2006, "types", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2024, "args", 2000, NULL, 0, true, 0, false, 0
]
+[ 2032, "sequences", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2042, "dependencies", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2046, "connections", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2064, "_columns", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2075, "_arrays", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2080, "_dimensions", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2086, "keys", 2000, NULL, 0, true, 0, false, 0
]
+[ 2093, "idxs", 2000, NULL, 0, true, 0, false, 0
]
+[ 2098, "triggers", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2109, "objects", 2000, NULL, 0, true, 0, false,
0 ]
+[ 2114, "_tables", 2113, NULL, 0, true, 2, false,
0 ]
+[ 2123, "_columns", 2113, NULL, 0, true, 2, false,
0 ]
+[ 2134, "_arrays", 2113, NULL, 0, true, 2, false,
0 ]
+[ 2139, "_dimensions", 2113, NULL, 0, true, 2, false,
0 ]
+[ 2145, "keys", 2113, NULL, 0, true, 2, false, 0
]
+[ 2152, "idxs", 2113, NULL, 0, true, 2, false, 0
]
+[ 2157, "triggers", 2113, NULL, 0, true, 2, false,
0 ]
+[ 2168, "objects", 2113, NULL, 0, true, 2, false,
0 ]
+[ 5082, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS
\"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS
\"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;",
1, true, 0, false, 0 ]
+[ 5092, "arrays", 2000, "SELECT * FROM (SELECT pt.*, 0 AS
\"temporary\", pa.valence, pa.fixed, pa.materialised FROM \"sys\".\"_tables\"
AS pt, \"sys\".\"_arrays\" AS pa WHERE pt.id = pa.table_id UNION ALL SELECT
tt.*, 1 AS \"temporary\", ta.valence, ta.fixed, ta.materialised FROM
\"tmp\".\"_tables\" AS tt, \"tmp\".\"_arrays\" AS ta WHERE tt.id = ta.table_id)
AS arrays;", 1, true, 0, false, 0 ]
+[ 5105, "columns", 2000, "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, false, 0 ]
+[ 5116, "dimensions", 2000, "SELECT * FROM (SELECT pc.*,
\"pd\".\"start\", pd.step, pd.stop, pd.storage_order FROM \"sys\".\"_columns\"
AS pc, \"sys\".\"_dimensions\" AS pd WHERE pc.id = pd.column_id UNION ALL
SELECT tc.*, \"td\".\"start\", td.step, td.stop, td.storage_order FROM
\"tmp\".\"_columns\" AS tc, \"tmp\".\"_dimensions\" AS td WHERE tc.id =
td.column_id) AS dimensions;", 1, true, 0, false, 0 ]
+[ 5137, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5145, "users", 2000, "SELECT u.\"name\" AS \"name\",
ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN
\"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true,
0, false, 0 ]
+[ 5149, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5152, "auths", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5156, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5309, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5323, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5340, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
+[ 6781, "files", 6775, NULL, 0, false, 0, false,
0 ]
+[ 6788, "catalog", 6775, NULL, 0, false, 0, false,
0 ]
+[ 7231, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 7272, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
+[ 7294, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 7403, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,13 +80,12 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
+MAPI = (monetdb) /var/tmp/mtest-16449/.s.monetdb.38905
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !cardinality violation (21>1)
-MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
+MAPI = (monetdb) /var/tmp/mtest-16449/.s.monetdb.38905
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (390>1)
-ERROR = !cardinality violation (326>1)
+ERROR = !cardinality violation (420>1)
# 21:00:43 >
diff --git a/sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
b/sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
--- a/sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
+++ b/sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
@@ -25,12 +25,12 @@ Ready.
# 19:37:54 >
#select * from tables where name LIKE ('hel%');
-% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables # table_name
-% id, name, schema_id, query, type, system, commit_action,
readonly, fixed_array, nr_dimensions, temporary # name
-% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
-% 1, 0, 1, 0, 1, 5, 1, 5, 5, 1,
1 # length
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
+% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
+% 1, 0, 1, 0, 1, 5, 1, 5, 1 # length
-# 21:48:45 >
-# 21:48:45 > "Done."
-# 21:48:45 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
