Changeset: 829741f101ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=829741f101ee
Modified Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: candidate-exceptions
Log Message:
Merge with default branch.
diffs (truncated from 38430 to 300 lines):
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
@@ -40,27 +40,23 @@ stdout of test 'sqlitelogictest-having-n
[ 0, 79, 26 ]
[ 81, 24, 43 ]
#SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 BETWEEN NULL AND +
col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ NULL ]
#SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN NULL
AND + col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
-[ NULL ]
-#debug SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN
NULL AND + col2;
-mdb>#X_2=0@0:void := querylog.define("debug select cast(sum(col0) as bigint)
from tab0 where + + col0 not between null and + col2;", "default_pipe", 24:int);
-mdb>#barrier X_137=false := language.dataflow();
-mdb>#X_5=0 := sql.mvc();
-mdb>#X_92=nil:bat[:int] := sql.bind(X_5=0, "sys", "tab0", "col0", 0:int,
0:int, 3:int);
-% sys.L4 # table_name
-% L4 # name
+[ 126 ]
+#finish
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
-[ NULL ]
+[ 126 ]
mdb>#EOD
#DROP TABLE tab0;
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -5109,9 +5109,6 @@ insert into sys.args values (26298, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5109,9 +5109,6 @@ insert into sys.args values (26298, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5938,9 +5938,6 @@ set schema "sys";
commit;
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
@@ -5110,6 +5107,14 @@ insert into sys.args values (26292, 135,
insert into sys.functions values (136, 'count', 'count', 'aggr', 0, 3, false,
false, false, 2000, true);
insert into sys.args values (26293, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+
+Running database upgrade commands:
+set schema "sys";
+create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
+create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
+create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
+set schema "sys";
commit;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5938,9 +5938,6 @@ set schema "sys";
commit;
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -5109,9 +5109,6 @@ insert into sys.args values (12098, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -5109,9 +5109,6 @@ insert into sys.args values (12098, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -5938,9 +5938,6 @@ set schema "sys";
commit;
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31771/.s.monetdb.37689
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -5108,9 +5108,6 @@ insert into sys.args values (27041, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5108,9 +5108,6 @@ insert into sys.args values (27041, 136,
set schema "sys";
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5937,9 +5937,6 @@ set schema "sys";
commit;
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
@@ -101316,6 +101316,10 @@ COPY 3 RECORDS INTO "testschema"."subtab
11 "eleven"
12 "twelve"
13 "thirteen"
+CREATE TABLE "testschema"."subtable3" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101369,8 +101373,9 @@ CREATE TABLE "testschema"."geomtest" (
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
-ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM '1' TO '11';
+ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
+ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable3" AS
PARTITION FROM '21' TO RANGE MAXVALUE;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits1" AS PARTITION IN ('1', '2', '3');
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits2" AS PARTITION IN ('4', '5', '6') WITH NULL VALUES;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits3" AS PARTITION IN ('7', '8', '9');
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -17,9 +17,6 @@ stdout of test 'upgrade` in directory 's
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30503/.s.monetdb.34683
# MonetDB/GIS module loaded
Running database upgrade commands:
-insert into sys.dependencies (select c.id as id, k.id as depend_id,
dt.dependency_type_id as depend_type from sys.dependency_types dt, sys._columns
c, sys.keys k, sys.objects o where k.id = o.id and o.name = c.name and
c.table_id = k.table_id and dt.dependency_type_name = 'KEY' and k.type = 1 and
not exists (select d.id from sys.dependencies d where d.id = c.id and
d.depend_id = k.id and d.depend_type = dt.dependency_type_id));
-
-Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
@@ -57,5848 +54,5848 @@ insert into sys.types values (32, 'mbr',
delete from sys.functions where id < 2000;
delete from sys.args where func_id not in (select id from sys.functions);
insert into sys.functions values (28, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true);
-insert into sys.args values (9172, 28, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (9173, 28, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (9176, 28, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (9177, 28, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (29, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (9174, 29, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (9175, 29, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (9178, 29, 'res_0', 'int', 32, 0, 0, 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
