Changeset: 36ff69e65bc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36ff69e65bc3
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
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-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Views/Tests/Views.stable.err
sql/test/bugs/Tests/alter_view.stable.err
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.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 SciQL specific ouput
mainly due to catatlogue extensions and modified error messages
diffs (truncated from 1218 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -59,6 +59,7 @@ tmp mTests_jdbc_tests mTests_jdbc_tests
Resultset with 10 columns
TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
mTests_jdbc_tests sys _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests sys _dimensions SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests sys _tables SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys args SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys auths SYSTEM TABLE null null null
null rowid SYSTEM
@@ -79,12 +80,15 @@ mTests_jdbc_tests sys triggers SYSTEM TA
mTests_jdbc_tests sys types SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys user_role SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests tmp _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests tmp _dimensions SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests tmp _tables SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp idxs SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp keys SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p WHERE type = 6 UNION ALL SELECT
t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t WHERE type = 6) AS arrays;
null null null rowid SYSTEM
mTests_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
+mTests_jdbc_tests sys dimensions SYSTEM VIEW 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; null null null
rowid SYSTEM
mTests_jdbc_tests sys querylog SYSTEM VIEW create view
querylog as
select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
where qd.id = ql.id; null null null rowid SYSTEM
diff --git
a/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
b/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
---
a/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
+++
b/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
@@ -81,7 +81,7 @@ stderr of test 'alter_view_not_allowed.S
MAPI = monetdb@sofia:38256
QUERY = alter table myview alter column a set null;
-ERROR = !ALTER TABLE: cannot set column options for VIEW 'myview'
+ERROR = !ALTER TABLE/ARRAY: cannot set column options for VIEW 'myview'
# 12:25:51 >
# 12:25:51 > Done.
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@sofia:38256
QUERY = insert into t1 values ((select id, name from tables));
-ERROR = !cardinality violation (31>1)
+ERROR = !cardinality violation (35>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
@@ -41,7 +41,7 @@ Ready.
[ 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, "keys", 2000, NULL, 0, true, 0, false, 0,
1, "one" ]
+[ 2075, "_dimensions", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
# 19:39:26 >
# 19:39:26 > Done.
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
-[ 30 ]
+[ 34 ]
#select count(distinct name) from tables;
% .tables # table_name
% L2 # name
% wrd # type
% 2 # length
-[ 24 ]
+[ 27 ]
#select count(name) , count(distinct name) from tables;
% .tables, .tables # table_name
% L3, L4 # name
% wrd, wrd # type
% 2, 2 # length
-[ 30, 24 ]
+[ 34, 27 ]
# 10:05:42 >
# 10:05:42 > Done.
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
--- a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -123,6 +123,10 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
# 17:14:07 >
# 17:14:07 > "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
@@ -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 (297>1)
+ERROR = !cardinality violation (374>1)
# 21:00:43 >
# 21:00:43 > Done.
diff --git a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
--- a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
+++ b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
@@ -58,6 +58,10 @@ Ready.
[ 28 ]
[ 29 ]
[ 30 ]
+[ 31 ]
+[ 32 ]
+[ 33 ]
+[ 34 ]
# 11:15:39 >
# 11:15:39 > Done.
diff --git a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
--- a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
+++ b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
@@ -28,13 +28,13 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 30 ]
+[ 34 ]
#WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
% .t # table_name
% L2 # name
% wrd # type
% 2 # length
-[ 30 ]
+[ 34 ]
# 22:41:45 >
# 22:41:45 > Done.
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.err
b/sql/test/Dependencies/Tests/Dependencies.stable.err
--- a/sql/test/Dependencies/Tests/Dependencies.stable.err
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.err
@@ -30,7 +30,7 @@ QUERY = ALTER TABLE t1 DROP COLUMN id;
ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects
which depend on it
MAPI = monetdb@alf:38889
QUERY = ALTER TABLE v1 DROP COLUMN age;
-ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1'
+ERROR = !ALTER TABLE/ARRAY: cannot drop column from VIEW 'v1'
MAPI = monetdb@alf:38889
QUERY = ALTER TABLE t2 ADD FOREIGN KEY(age_v1) REFERENCES v1(age);
ERROR = !CONSTRAINT FOREIGN KEY: could not find referenced PRIMARY KEY in
table 'v1'
diff --git a/sql/test/LSST/Tests/dbQuery036.stable.err
b/sql/test/LSST/Tests/dbQuery036.stable.err
--- a/sql/test/LSST/Tests/dbQuery036.stable.err
+++ b/sql/test/LSST/Tests/dbQuery036.stable.err
@@ -86,7 +86,7 @@ QUERY = SELECT ROUND(uMag-gMag,0) AS UG
AND (uMag+gMag+rMag+iMag+zMag+yMag) < 150 -- exclude bogus
magnitudes (== 999)
GROUP BY UG, GR, RI, IZ, ZY
HAVING pop > 500 -- Common bucktes have 500 or more members, so
delete them
-ERROR = !SELECT: identifier 'pop' unknown
+ERROR = !COUNT: 'count(*)' not implemented for array tiles
# 05:57:35 >
# 05:57:35 > Done.
diff --git a/sql/test/Views/Tests/Views.stable.err
b/sql/test/Views/Tests/Views.stable.err
--- a/sql/test/Views/Tests/Views.stable.err
+++ b/sql/test/Views/Tests/Views.stable.err
@@ -73,7 +73,7 @@ stderr of test 'Views` in directory 'tes
MAPI = monetdb@sofia:38256
QUERY = ALTER TABLE v1 DROP COLUMN age;
-ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1'
+ERROR = !ALTER TABLE/ARRAY: cannot drop column from VIEW 'v1'
MAPI = monetdb@sofia:38256
QUERY = CREATE TRIGGER trigger_test AFTER INSERT ON v1
INSERT INTO t2 values(1,23);
diff --git a/sql/test/bugs/Tests/alter_view.stable.err
b/sql/test/bugs/Tests/alter_view.stable.err
--- a/sql/test/bugs/Tests/alter_view.stable.err
+++ b/sql/test/bugs/Tests/alter_view.stable.err
@@ -12,7 +12,7 @@ stderr of test 'alter_view` in directory
MAPI = monetdb@localhost:34930
QUERY = ALTER TABLE v1 ADD PRIMARY KEY(age);
-ERROR = !ALTER TABLE: cannot add constraint to VIEW 'v1'
+ERROR = !ALTER TABLE/ARRAY: cannot add constraint to VIEW 'v1'
# 10:54:20 >
# 10:54:20 > Done.
diff --git a/sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
b/sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
--- a/sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
+++ b/sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
@@ -20,15 +20,15 @@ Ready.
#create table tmp(name string, id int);
#insert into tmp select name, id from tables where "type" = 0;
-[ 27 ]
+[ 29 ]
#select count(*) from tmp;
% sys.tmp # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 27 ]
+[ 29 ]
#delete from tmp;
-[ 27 ]
+[ 29 ]
#select count(*) from tmp;
% sys.tmp # table_name
% L2 # name
@@ -36,15 +36,15 @@ Ready.
% 1 # length
[ 0 ]
#insert into tmp select name, id from tables where "type" = 0;
-[ 27 ]
+[ 29 ]
#select count(*) from tmp;
% sys.tmp # table_name
% L3 # name
% wrd # type
% 2 # length
-[ 27 ]
+[ 29 ]
#delete from tmp;
-[ 27 ]
+[ 29 ]
#select count(*) from tmp;
% sys.tmp # table_name
% L4 # name
diff --git a/sql/test/bugs/Tests/simple_view.stable.out
b/sql/test/bugs/Tests/simple_view.stable.out
--- a/sql/test/bugs/Tests/simple_view.stable.out
+++ b/sql/test/bugs/Tests/simple_view.stable.out
@@ -37,18 +37,22 @@ Ready.
[ "connections", "str", 1 ]
[ "_tables", "str", 1 ]
[ "_columns", "str", 1 ]
+[ "_dimensions", "str", 1 ]
[ "keys", "str", 1 ]
[ "idxs", "str", 1 ]
[ "triggers", "str", 1 ]
[ "objects", "str", 1 ]
[ "_tables", "str", 1 ]
[ "_columns", "str", 1 ]
+[ "_dimensions", "str", 1 ]
[ "keys", "str", 1 ]
[ "idxs", "str", 1 ]
[ "triggers", "str", 1 ]
[ "objects", "str", 1 ]
[ "tables", "str", 1 ]
[ "columns", "str", 1 ]
+[ "arrays", "str", 1 ]
+[ "dimensions", "str", 1 ]
[ "db_user_info", "str", 1 ]
[ "users", "str", 1 ]
[ "user_role", "str", 1 ]
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
@@ -23,11 +23,11 @@ Ready.
# 15:08:38 > /usr/bin/python crash_on_concurrent_use.SF-1411926.SQL.py
crash_on_concurrent_use.SF-1411926
# 15:08:38 >
-(0, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(1, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(2, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(3, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(4, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(0, [(34,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(1, [(34,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(2, [(34,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(3, [(34,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(4, [(34,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
# 15:08:38 >
# 15:08:38 > Done.
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,35 +50,35 @@ Ready.
% 3, 3, 4 # length
[ "int", "int", 16 ]
[ "int", "lng", 2 ]
-[ "int", "str", 142 ]
-[ "oid", "bit", 1151 ]
-[ "oid", "bit", 1151 ]
+[ "int", "str", 147 ]
+[ "oid", "bit", 1180 ]
+[ "oid", "bit", 1180 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
-[ "oid", "int", 1151 ]
-[ "oid", "int", 1151 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
