Changeset: af3907be9644 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af3907be9644
Modified Files:
sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
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/Tests/like_exp.SF-1613949.stable.out
sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: sciql
Log Message:
Approved stable.out due to recent changes in the SQL catalog
diffs (191 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
@@ -32,7 +32,7 @@ Ready.
# 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, nr_dimensions, temporary, id, name,
authorization, owner # 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
#SELECT *
@@ -44,7 +44,7 @@ Ready.
# 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, nr_dimensions, temporary, id, name,
authorization, owner # 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
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
@@ -29,19 +29,19 @@ Ready.
[ 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, nr_dimensions, temporary, n, s # 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, 12, 4, 0, 1, 5, 1, 5, 5, 1,
1, 1, 3 # length
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2024, "args", 2000, NULL, 0, true, 0, false, true,
0, 0, 1, "one" ]
-[ 2032, "sequences", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2042, "dependencies", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2046, "connections", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2066, "_columns", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
-[ 2077, "_dimensions", 2000, NULL, 0, true, 0, false,
true, 0, 0, 1, "one" ]
+[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2006, "types", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2015, "functions", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2024, "args", 2000, NULL, 0, true, 0, false, false,
0, 0, 1, "one" ]
+[ 2032, "sequences", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2042, "dependencies", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2046, "connections", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2066, "_columns", 2000, NULL, 0, true, 0, false,
false, 0, 0, 1, "one" ]
+[ 2077, "_dimensions", 2000, NULL, 0, true, 0, false,
false, 0, 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
@@ -27,12 +27,12 @@ Ready.
#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, nr_dimensions, temporary # 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
#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, nr_dimensions, temporary # 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
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
@@ -26,7 +26,7 @@ Ready.
#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, nr_dimensions, temporary # 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
diff --git a/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
b/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
--- a/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
+++ b/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
@@ -32,7 +32,7 @@ Ready.
#"keys"."type" = 0 AND "schemas"."name" LIKE 'sys' AND
#"tables"."name" LIKE 'x';
% .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, nr_dimensions, temporary, id, name,
authorization, owner # 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
#SELECT * FROM "sys"."keys" AS "keys", "sys"."objects" AS
@@ -43,7 +43,7 @@ Ready.
#"keys"."type" = 0 AND "schemas"."name" LIKE 'sys' AND
#"tables"."name" LIKE 'x' 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, nr_dimensions, temporary, id, name,
authorization, owner # 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
#SELECT cast(null AS varchar(1)) AS "TABLE_CAT",
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -63,43 +63,43 @@ queryhistory
callhistory
querylog
systemfunctions
-id name schema_id query type system commit_action
readonly fixed nr_dimensions temporary
-2001 schemas 2000 0 true 0 false true 0
0
-2006 types 2000 0 true 0 false true 0
0
-2015 functions 2000 0 true 0 false true
0 0
-2024 args 2000 0 true 0 false true 0
0
-2032 sequences 2000 0 true 0 false true
0 0
-2042 dependencies 2000 0 true 0 false true
0 0
-2046 connections 2000 0 true 0 false true
0 0
-2055 _tables 2000 0 true 0 false true 0
0
-2066 _columns 2000 0 true 0 false true
0 0
-2077 _dimensions 2000 0 true 0 false true
0 0
-2082 keys 2000 0 true 0 false true 0
0
-2089 idxs 2000 0 true 0 false true 0
0
-2094 triggers 2000 0 true 0 false true
0 0
-2105 objects 2000 0 true 0 false true 0
0
-2110 _tables 2109 0 true 2 false true 0
0
-2121 _columns 2109 0 true 2 false true
0 0
-2132 _dimensions 2109 0 true 2 false true
0 0
-2137 keys 2109 0 true 2 false true 0
0
-2144 idxs 2109 0 true 2 false true 0
0
-2149 triggers 2109 0 true 2 false true
0 0
-2160 objects 2109 0 true 2 false true 0
0
-4979 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 true 0 0
-4991 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 true 0 0
-5002 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 true 0 0
-5014 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 true 0 0
-5037 db_user_info 2000 0 true 0 false true
0 0
-5045 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 true 0
0
-5049 user_role 2000 0 true 0 false true
0 0
-5052 auths 2000 0 true 0 false true 0
0
-5056 privileges 2000 0 true 0 false true
0 0
-5209 queryhistory 2000 0 true 0 false true
0 0
-5223 callhistory 2000 0 true 0 false true
0 0
-5240 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false true 0 0
-6374 systemfunctions 2000 0 true 0 false true
0 0
+id name schema_id query type system commit_action
readonly fixed_array nr_dimensions temporary
+2001 schemas 2000 0 true 0 false false 0
0
+2006 types 2000 0 true 0 false false 0
0
+2015 functions 2000 0 true 0 false false
0 0
+2024 args 2000 0 true 0 false false 0
0
+2032 sequences 2000 0 true 0 false false
0 0
+2042 dependencies 2000 0 true 0 false false
0 0
+2046 connections 2000 0 true 0 false false
0 0
+2055 _tables 2000 0 true 0 false false 0
0
+2066 _columns 2000 0 true 0 false false
0 0
+2077 _dimensions 2000 0 true 0 false false
0 0
+2082 keys 2000 0 true 0 false false 0
0
+2089 idxs 2000 0 true 0 false false 0
0
+2094 triggers 2000 0 true 0 false false
0 0
+2105 objects 2000 0 true 0 false false 0
0
+2110 _tables 2109 0 true 2 false false 0
0
+2121 _columns 2109 0 true 2 false false
0 0
+2132 _dimensions 2109 0 true 2 false false
0 0
+2137 keys 2109 0 true 2 false false 0
0
+2144 idxs 2109 0 true 2 false false 0
0
+2149 triggers 2109 0 true 2 false false
0 0
+2160 objects 2109 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 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 0 true 0 false false
0 0
+5080 auths 2000 0 true 0 false false 0
0
+5084 privileges 2000 0 true 0 false false
0 0
+5237 queryhistory 2000 0 true 0 false false
0 0
+5251 callhistory 2000 0 true 0 false false
0 0
+5268 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false false 0 0
+6456 systemfunctions 2000 0 true 0 false false
0 0
-# 14:42:45 >
-# 14:42:45 > "Done."
-# 14:42:45 >
+# 13:00:28 >
+# 13:00:28 > "Done."
+# 13:00:28 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
