Changeset: 56249fe153f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56249fe153f5
Modified Files:
gdk/gdk_batop.c
sql/backends/monet5/sql_upgrades.c
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/upgrade.stable.out.int128
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: default
Log Message:
Merge with Apr2019 branch.
diffs (truncated from 342 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1766,12 +1766,12 @@ BATsort(BAT **sorted, BAT **order, BAT *
MT_lock_set(&GDKhashLock(pb->batCacheid));
if (pb->torderidx == NULL) {
pb->batDirtydesc = true;
- pb->torderidx = m;
if (ords != (oid *) m->base + ORDERIDXOFF) {
memcpy((oid *) m->base + ORDERIDXOFF,
ords,
BATcount(pb) * sizeof(oid));
}
+ pb->torderidx = m;
persistOIDX(pb);
} else {
HEAPfree(m, true);
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1925,17 +1925,30 @@ sql_update_storagemodel(Client c, mvc *s
static str
sql_update_apr2019_sp1(Client c)
{
- size_t bufsize = 1000, pos = 0;
- char *buf, *err;
-
- if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_aug2018_sp2", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ char *err;
+ char *qry = "select c.id 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);";
+ res_table *output = NULL;
- /* required update for changeset 23e1231ada99 */
- pos += snprintf(buf + pos, bufsize - pos,
- "insert into 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));\n");
- err = SQLstatementIntern(c, &buf, "update", true, false, NULL);
- GDKfree(buf);
+ /* Determine if missing dependency table entry for unique keys
+ * is required */
+ err = SQLstatementIntern(c, &qry, "update", true, false, &output);
+ if (err == NULL) {
+ BAT *b = BATdescriptor(output->cols[0].b);
+ if (b) {
+ if (BATcount(b) > 0) {
+ /* required update for changeset 23e1231ada99 */
+ qry = "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));\n";
+ printf("Running database upgrade
commands:\n%s\n", qry);
+ err = SQLstatementIntern(c, &qry, "update",
true, false, NULL);
+ }
+ BBPunfix(b->batCacheid);
+ }
+ }
+ if (output != NULL)
+ res_tables_destroy(output);
+
return err; /* usually MAL_SUCCEED */
}
@@ -2214,30 +2227,9 @@ SQLupgrades(Client c, mvc *m)
}
}
- {
- /* Determine if missing dependency table entry for unique keys
is required */
- char *qry = "select c.id 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);";
- res_table *output = NULL;
- err = SQLstatementIntern(c, &qry, "update", true, false,
&output);
- if (err) {
- fprintf(stderr, "!%s\n", err);
- freeException(err);
- } else {
- BAT *b = BATdescriptor(output->cols[0].b);
- if (b) {
- if (BATcount(b) > 0) {
- if ((err = sql_update_apr2019_sp1(c))
!= NULL) {
- fprintf(stderr, "!%s\n", err);
- freeException(err);
- }
- }
- BBPunfix(b->batCacheid);
- }
- }
- if (output != NULL)
- res_tables_destroy(output);
+ if ((err = sql_update_apr2019_sp1(c)) != NULL) {
+ fprintf(stderr, "!%s\n", err);
+ freeException(err);
}
if ((err = sql_update_default(c, m)) != NULL) {
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,6 +17,9 @@ 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,6 +17,9 @@ 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,6 +5109,9 @@ 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,6 +5109,9 @@ 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,6 +5938,9 @@ 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,6 +17,9 @@ 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.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,6 +5938,9 @@ 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,6 +17,9 @@ 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,6 +5109,9 @@ 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,6 +5109,9 @@ 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,6 +5938,9 @@ 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,6 +17,9 @@ 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,6 +5108,9 @@ 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,6 +5108,9 @@ 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,6 +5937,9 @@ 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/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,6 +17,9 @@ 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:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
