Changeset: de6fb5dad2d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de6fb5dad2d9
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/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: sciql
Log Message:
approved the stable.out due to changed in the SQL catalog
diffs (truncated from 751 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, .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
+% .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
+% 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 "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, .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
+% .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
+% 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
-# 14:57:17 >
-# 14:57:17 > Done.
-# 14:57:17 >
+# 21:34:14 >
+# 21:34:14 > "Done."
+# 21:34:14 >
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,22 +28,23 @@ Ready.
[ 1 ]
[ 1 ]
#select * from tables, x limit 10;
-% .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, 12, 4, 0, 1, 5, 1, 5, 1, 1,
3 # length
-[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2006, "types", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2024, "args", 2000, NULL, 0, true, 0, false, 0,
1, "one" ]
-[ 2032, "sequences", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2042, "dependencies", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2046, "connections", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2064, "_columns", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2075, "_dimensions", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
+% .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
+% 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" ]
+#drop table x cascade;
-# 19:39:26 >
-# 19:39:26 > Done.
-# 19:39:26 >
+# 18:40:33 >
+# 18:40:33 > "Done."
+# 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 # 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
+% .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
+% 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 # 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
+% .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
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
+% 1, 0, 1, 0, 1, 5, 1, 5, 5, 1,
1 # length
-# 08:08:12 >
-# 08:08:12 > Done.
-# 08:08:12 >
+# 18:45:19 >
+# 18:45:19 > "Done."
+# 18:45:19 >
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
@@ -85,7 +85,7 @@ QUERY = select * from env() as env where
ERROR = !cardinality violation (21>1)
MAPI = monetdb@niels:39633
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (376>1)
+ERROR = !cardinality violation (385>1)
# 21:00:43 >
# 21:00:43 > Done.
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 # 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
+% .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
+% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, boolean, int, tinyint # type
+% 1, 0, 1, 0, 1, 5, 1, 5, 5, 1,
1 # length
-# 19:37:54 >
-# 19:37:54 > Done.
-# 19:37:54 >
+# 21:48:45 >
+# 21:48:45 > "Done."
+# 21:48:45 >
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
@@ -31,10 +31,10 @@ Ready.
#AND "tables"."schema_id" = "schemas"."id" AND
#"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, .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
+% .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
+% 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
#"objects", "sys"."tables" AS "tables",
#"sys"."schemas" AS "schemas" WHERE "keys"."id" =
@@ -42,10 +42,10 @@ Ready.
#AND "tables"."schema_id" = "schemas"."id" AND
#"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, .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
+% .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
+% 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",
#"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
#"TABLE_NAME", "objects"."name" AS "COLUMN_NAME",
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -50,7 +50,7 @@ Ready.
% 3, 3, 4 # length
[ "int", "int", 16 ]
[ "int", "lng", 2 ]
-[ "int", "str", 147 ]
+[ "int", "str", 149 ]
[ "oid", "bit", 1182 ]
[ "oid", "bit", 1182 ]
[ "oid", "int", 19 ]
@@ -78,7 +78,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 521 ]
+[ "transient", 529 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -30,11 +30,12 @@ Ready.
% 3, 9, 4 # length
[ "int", "int", 0 ]
[ "int", "lng", 2 ]
-[ "int", "str", 147 ]
+[ "int", "str", 149 ]
[ "oid", "bit", 0 ]
[ "oid", "bit", 93 ]
[ "oid", "bit", 93 ]
-[ "oid", "bit", 376 ]
+[ "oid", "bit", 93 ]
+[ "oid", "bit", 385 ]
[ "oid", "bit", 1182 ]
[ "oid", "bit", 1182 ]
[ "oid", "int", 0 ]
@@ -77,13 +78,14 @@ Ready.
[ "oid", "int", 42 ]
[ "oid", "int", 93 ]
[ "oid", "int", 93 ]
+[ "oid", "int", 93 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
+[ "oid", "int", 385 ]
+[ "oid", "int", 385 ]
+[ "oid", "int", 385 ]
+[ "oid", "int", 385 ]
+[ "oid", "int", 385 ]
[ "oid", "int", 1182 ]
[ "oid", "int", 1182 ]
[ "oid", "int", 1182 ]
@@ -167,10 +169,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 93 ]
[ "oid", "str", 93 ]
-[ "oid", "str", 376 ]
-[ "oid", "str", 376 ]
-[ "oid", "str", 376 ]
-[ "oid", "str", 376 ]
+[ "oid", "str", 385 ]
+[ "oid", "str", 385 ]
+[ "oid", "str", 385 ]
+[ "oid", "str", 385 ]
[ "oid", "str", 1182 ]
[ "oid", "str", 1182 ]
[ "oid", "str", 1182 ]
@@ -187,13 +189,13 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 178 ]
+[ "transient", 182 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
% char, wrd # type
% 10, 3 # length
-[ "persistent", 154 ]
+[ "persistent", 156 ]
# 22:02:15 >
# 22:02:15 > Done.
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -30,11 +30,12 @@ Ready.
% 3, 9, 4 # length
[ "int", "int", 0 ]
[ "int", "lng", 2 ]
-[ "int", "str", 147 ]
+[ "int", "str", 149 ]
[ "oid", "bit", 0 ]
[ "oid", "bit", 93 ]
[ "oid", "bit", 93 ]
-[ "oid", "bit", 376 ]
+[ "oid", "bit", 93 ]
+[ "oid", "bit", 385 ]
[ "oid", "bit", 1182 ]
[ "oid", "bit", 1182 ]
[ "oid", "int", 0 ]
@@ -77,13 +78,14 @@ Ready.
[ "oid", "int", 42 ]
[ "oid", "int", 93 ]
[ "oid", "int", 93 ]
+[ "oid", "int", 93 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
-[ "oid", "int", 376 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
