Changeset: 979e54bc524d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/979e54bc524d
Modified Files:
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.ppc64.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.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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: Jul2021
Log Message:
Fix upgrade and approve.
diffs (223 lines):
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
@@ -2396,7 +2396,9 @@ sql_update_jul2021(Client c, mvc *sql, c
"create function
sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n"
"returns table (id int,
segments bigint, \"all\" bigint, inserted bigint, updates bigint, deletes
bigint, level int)\n"
- "external name
sql.deltas;\n");
+ "external name
sql.deltas;\n"
+ "update sys.functions
set system = true"
+ " where schema_id =
2000 and name = 'deltas';\n");
/* fix up dependencies for function getproj4 (if it
exists) */
pos += snprintf(buf + pos, bufsize - pos,
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
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
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
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
