Changeset: cc71c9124568 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc71c9124568
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.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: Jun2020
Log Message:

Fix upgrade.


diffs (240 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
@@ -2311,7 +2311,7 @@ sql_update_jun2020(Client c, mvc *sql, c
        pos += snprintf(buf + pos, bufsize - pos,
                        "update sys.args set name = name || '_' || cast(number 
as string) where name in ('arg', 'res') and func_id in (select id from 
sys.functions f where f.system);\n");
        pos += snprintf(buf + pos, bufsize - pos,
-                       "insert into sys.dependencies values ((select id from 
sys.functions where name = 'ms_round' and schema_id = (select id from 
sys.schemas where name = 'sys')), (select id from sys.functions where name = 
'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select dependency_type_id from sys.dependency_types where dependency_type_name 
= 'FUNCTION'));\n");
+                       "insert into sys.dependencies values ((select id from 
sys.functions where name = 'ms_trunc' and schema_id = (select id from 
sys.schemas where name = 'sys')), (select id from sys.functions where name = 
'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select dependency_type_id from sys.dependency_types where dependency_type_name 
= 'FUNCTION'));\n");
 
        /* 12_url */
        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
@@ -5907,7 +5907,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (34148, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5907,7 +5907,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (34143, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (30284, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (30284, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5953,7 +5953,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (30935, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (30279, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5953,7 +5953,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (30930, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5907,7 +5907,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (13525, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (12285, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (12285, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5953,7 +5953,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (12936, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5907,7 +5907,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (34450, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5119,7 +5119,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (31027, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5119,7 +5119,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (31027, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5952,7 +5952,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (31678, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5907,7 +5907,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (13728, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (12488, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (12488, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
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
@@ -5953,7 +5953,7 @@ set schema "sys";
 update sys.functions set language = language - 2 where language in (8, 9);
 insert into sys.args values (13139, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
 update sys.args set name = name || '_' || cast(number as string) where name in 
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name 
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')), 
(select id from sys.functions where name = 'ms_round' and schema_id = (select 
id from sys.schemas where name = 'sys')), (select dependency_type_id from 
sys.dependency_types where dependency_type_name = 'FUNCTION'));
 drop function isaURL(url);
 CREATE function isaURL(theUrl string) RETURNS BOOL
  EXTERNAL NAME url."isaURL";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to