Changeset: b09b43d54d6b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b09b43d54d6b
Modified Files:
        sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/check.stable.out
        sql/test/emptydb-upgrade/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
        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
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
        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: Jun2016
Log Message:

Approved new upgrade code.


diffs (truncated from 352 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -7723,6 +7723,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 16:23:51 >  
 # 16:23:51 >  "Done."
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
@@ -5652,6 +5652,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out 
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
@@ -7146,6 +7146,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 12:41:47 >  
 # 12:41:47 >  "Done."
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
@@ -7723,6 +7723,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 16:23:51 >  
 # 16:23:51 >  "Done."
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
@@ -4954,6 +4954,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" 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
@@ -5696,6 +5696,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
@@ -7723,6 +7723,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 16:23:51 >  
 # 16:23:51 >  "Done."
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
@@ -5653,6 +5653,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/emptydb-upgrade/Tests/check.stable.out 
b/sql/test/emptydb-upgrade/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/check.stable.out
@@ -7146,6 +7146,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 12:41:47 >  
 # 12:41:47 >  "Done."
diff --git a/sql/test/emptydb-upgrade/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
@@ -7723,6 +7723,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 16:23:51 >  
 # 16:23:51 >  "Done."
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
@@ -4955,6 +4955,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" 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
@@ -5697,6 +5697,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/emptydb/Tests/check.stable.out 
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -7146,6 +7146,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 12:41:47 >  
 # 12:41:47 >  "Done."
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -7723,6 +7723,8 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
+#drop function pcre_replace(string, string, string, string);
 
 # 16:23:51 >  
 # 16:23:51 >  "Done."
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
@@ -5650,6 +5650,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
@@ -5650,6 +5650,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" 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
@@ -4949,6 +4949,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" 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
@@ -4949,6 +4949,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" 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
@@ -5691,6 +5691,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out 
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
@@ -5653,6 +5653,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
+ select distinct id, depend_id, depend_type from sys.dependencies where 
depend_type = 15;
 create function sys."storage"( sname string)
 returns table (
     "schema" string,
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32 
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
@@ -5653,6 +5653,12 @@ insert into sys.keywords values
 ('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
 ('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
 ('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), 
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), 
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+insert into sys.dependency_types (dependency_type_id, dependency_type_name)
+ select 15 as id, 'TYPE' as name where 15 not in (select dependency_type_id 
from sys.dependency_types);
+insert into sys.dependencies (id, depend_id, depend_type)
+ select distinct types.id as type_id, args.func_id, 15 as depend_type from 
sys.args join sys.types on types.systemname = args.type where args.type in 
('inet', 'json', 'url', 'uuid')
+ except
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to