Changeset: 98d11206cbc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98d11206cbc6
Modified Files:
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
sql/test/Users/Tests/test_privs2_p1.stable.out
sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
Branch: Jun2016
Log Message:
Approvals.
diffs (truncated from 348 to 300 lines):
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -70,11 +70,11 @@ Ready.
% .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2 #
table_name
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints, sorted # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint, boolean # type
-% 3, 7, 13, 8, 8, 3, 1, 5, 1, 5 #
length
+% 3, 7, 13, 8, 8, 2, 1, 5, 1, 5 #
length
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
163, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
@@ -95,11 +95,11 @@ Ready.
% .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2 #
table_name
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints, sorted # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint, boolean # type
-% 3, 7, 13, 8, 8, 3, 4, 5, 1, 5 #
length
+% 3, 7, 13, 8, 8, 2, 4, 5, 1, 5 #
length
[ "sys", "_tables", "id", "int", "writable", 4, 2600,
false, 0, false ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
163, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
@@ -34,12 +34,12 @@ Operation successful
SELECT users.name, users.fullname, schemas.name
FROM users, schemas
WHERE users.default_schema = schemas.id;
-+---------+---------------+--------+
++---------+---------------+------+
| name | fullname | name |
-+=========+===============+========+
++=========+===============+======+
| monetdb | MonetDB Admin | sys |
| voc | VOC Explorer | sys |
-+---------+---------------+--------+
++---------+---------------+------+
2 rows
CREATE SCHEMA "voc" AUTHORIZATION "voc";
@@ -51,12 +51,12 @@ Operation successful
SELECT users.name, users.fullname, schemas.name
FROM sys.users, sys.schemas
WHERE users.default_schema = schemas.id;
-+---------+---------------+--------+
++---------+---------------+------+
| name | fullname | name |
-+=========+===============+========+
++=========+===============+======+
| monetdb | MonetDB Admin | sys |
| voc | VOC Explorer | voc |
-+---------+---------------+--------+
++---------+---------------+------+
2 rows
diff --git a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
--- a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
+++ b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
@@ -34,7 +34,7 @@ Ready.
[ 19260102 ]
[ 19260104 ]
#SELECT date, (SELECT max(date) from test_subquery where date >
t1892413a.date) as dtNext from test_subquery t1892413a;
-% .t1892413a, .L2 # table_name
+% .t1892413a, .L1 # table_name
% date, dtnext # name
% int, int # type
% 8, 8 # length
diff --git a/sql/test/Users/Tests/test_privs2_p1.stable.out
b/sql/test/Users/Tests/test_privs2_p1.stable.out
--- a/sql/test/Users/Tests/test_privs2_p1.stable.out
+++ b/sql/test/Users/Tests/test_privs2_p1.stable.out
@@ -34,7 +34,7 @@ Ready.
#insert into version (name ,i) values ('test2' ,2) ;
[ 1 ]
#SELECT insertversion('test3', 3);
-% . # table_name
+% .L # table_name
% insertversion_single_value # name
% int # type
% 1 # length
@@ -48,7 +48,7 @@ Ready.
[ "test2", 2 ]
[ "test3", 3 ]
#SELECT updateversion('test1', 4);
-% . # table_name
+% .L # table_name
% updateversion_single_value # name
% int # type
% 1 # length
@@ -62,7 +62,7 @@ Ready.
[ "test2", 2 ]
[ "test3", 3 ]
#SELECT deleteversion(4);
-% . # table_name
+% .L # table_name
% deleteversion_single_value # name
% int # type
% 1 # length
diff --git
a/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
b/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
--- a/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
+++ b/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
@@ -209,34 +209,34 @@ START TRANSACTION;
Operation successful
SELECT class FROM a EXCEPT SELECT 16 ORDER BY class; -- all but 16
-+--------+
++-------+
| class |
-+========+
++=======+
| 2 |
| 11 |
| 17 |
| 18 |
-+--------+
++-------+
4 rows
SELECT class FROM a UNION SELECT 16 ORDER BY class; -- all with 16 (distinct
so invisible)
-+--------+
++-------+
| class |
-+========+
++=======+
| 2 |
| 11 |
| 16 |
| 17 |
| 18 |
-+--------+
++-------+
5 rows
SELECT class FROM a INTERSECT SELECT 16 ORDER BY class; -- just 16
-+--------+
++-------+
| class |
-+========+
++=======+
| 16 |
-+--------+
++-------+
1 row
ROLLBACK;
@@ -248,9 +248,9 @@ START TRANSACTION;
Operation successful
SELECT * FROM a EXCEPT SELECT * FROM b ORDER BY class, property; -- should be
last 50% of a
-+----------+--------+
++----------+-------+
| property | class |
-+==========+========+
++==========+=======+
| 13 | 11 |
| 12 | 16 |
| 15 | 16 |
@@ -259,13 +259,13 @@ SELECT * FROM a EXCEPT SELECT * FROM b O
| 29 | 16 |
| 23 | 18 |
| 24 | 18 |
-+----------+--------+
++----------+-------+
8 rows
SELECT * FROM a UNION SELECT * FROM b ORDER BY class, property; -- should be a
+ last 50% of b
-+----------+--------+
++----------+-------+
| property | class |
-+==========+========+
++==========+=======+
| 20 | 2 |
| 12 | 10 |
| 13 | 11 |
@@ -289,13 +289,13 @@ SELECT * FROM a UNION SELECT * FROM b OR
| 23 | 17 |
| 23 | 18 |
| 24 | 18 |
-+----------+--------+
++----------+-------+
23 rows
SELECT * FROM a INTERSECT SELECT * FROM b ORDER BY class, property; -- should
be first 50% of a
-+----------+--------+
++----------+-------+
| property | class |
-+==========+========+
++==========+=======+
| 20 | 2 |
| 4 | 16 |
| 5 | 16 |
@@ -304,7 +304,7 @@ SELECT * FROM a INTERSECT SELECT * FROM
| 19 | 17 |
| 21 | 17 |
| 22 | 17 |
-+----------+--------+
++----------+-------+
8 rows
ROLLBACK;
@@ -317,9 +317,9 @@ START TRANSACTION;
Operation successful
SELECT class FROM a EXCEPT ALL SELECT 16 ORDER BY class; -- all but one 16
(will have 16 in output!)
-+--------+
++-------+
| class |
-+========+
++=======+
| 2 |
| 11 |
| 16 |
@@ -335,13 +335,13 @@ SELECT class FROM a EXCEPT ALL SELECT 16
| 17 |
| 18 |
| 18 |
-+--------+
++-------+
15 rows
SELECT class FROM a UNION ALL SELECT 16 ORDER BY class; -- all plus 16
-+--------+
++-------+
| class |
-+========+
++=======+
| 2 |
| 11 |
| 16 |
@@ -359,15 +359,15 @@ SELECT class FROM a UNION ALL SELECT 16
| 17 |
| 18 |
| 18 |
-+--------+
++-------+
17 rows
SELECT class FROM a INTERSECT ALL SELECT 16 ORDER BY class; -- just one 16 (!)
-+--------+
++-------+
| class |
-+========+
++=======+
| 16 |
-+--------+
++-------+
1 row
ROLLBACK;
@@ -381,9 +381,9 @@ START TRANSACTION;
Operation successful
SELECT * FROM a EXCEPT ALL SELECT * FROM b ORDER BY class, property; -- last
50% of a
-+----------+--------+
++----------+-------+
| property | class |
-+==========+========+
++==========+=======+
| 13 | 11 |
| 12 | 16 |
| 15 | 16 |
@@ -392,13 +392,13 @@ SELECT * FROM a EXCEPT ALL SELECT * FROM
| 29 | 16 |
| 23 | 18 |
| 24 | 18 |
-+----------+--------+
++----------+-------+
8 rows
SELECT class FROM a EXCEPT ALL SELECT class FROM b ORDER BY class; -- a minus
the elements from b that are in a (if count(x) in a > count(x) in b, x will
appear in output)
-+--------+
++-------+
| class |
-+========+
++=======+
| 11 |
| 16 |
| 16 |
@@ -407,13 +407,13 @@ SELECT class FROM a EXCEPT ALL SELECT cl
| 16 |
| 18 |
| 18 |
-+--------+
++-------+
8 rows
SELECT * FROM a UNION ALL SELECT * FROM b ORDER BY class, property; -- a + b
-+----------+--------+
++----------+-------+
| property | class |
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
