Changeset: f8ebd0891767 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8ebd0891767
Modified Files:
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: Nov2019
Log Message:
Approve upgrade code.
diffs (truncated from 418 to 300 lines):
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (29455, 1500
insert into sys.args values (29456, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (29457, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (29458, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (29458, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (29459, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (29460, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (29461, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6010,6 +6010,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (29450, 1500
insert into sys.args values (29451, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (29452, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (29453, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (29453, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (29454, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (29455, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (29456, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6010,6 +6010,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4964,7 +4964,7 @@ insert into sys.args values (26199, 1305
insert into sys.args values (26200, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26201, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26202, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26202, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26203, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26204, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26205, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5220,6 +5220,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4964,7 +4964,7 @@ insert into sys.args values (26199, 1305
insert into sys.args values (26200, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26201, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26202, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26202, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26203, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26204, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26205, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5220,6 +5220,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (26780, 1500
insert into sys.args values (26781, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26782, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26783, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26783, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26784, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26785, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26786, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6048,6 +6048,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
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
@@ -4964,7 +4964,7 @@ insert into sys.args values (26194, 1305
insert into sys.args values (26195, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26196, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26197, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26197, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26198, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26199, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26200, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5220,6 +5220,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (26775, 1500
insert into sys.args values (26776, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26777, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26778, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26778, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26779, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26780, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26781, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6048,6 +6048,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (13224, 1500
insert into sys.args values (13225, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (13226, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (13227, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (13227, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (13228, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (13229, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (13230, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6010,6 +6010,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4964,7 +4964,7 @@ insert into sys.args values (11999, 1305
insert into sys.args values (12000, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (12001, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (12002, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (12002, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (12003, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (12004, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (12005, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5220,6 +5220,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4964,7 +4964,7 @@ insert into sys.args values (11999, 1305
insert into sys.args values (12000, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (12001, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (12002, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (12002, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (12003, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (12004, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (12005, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5220,6 +5220,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (12580, 1500
insert into sys.args values (12581, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (12582, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (12583, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (12583, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (12584, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (12585, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (12586, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6048,6 +6048,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
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
@@ -5736,7 +5736,7 @@ insert into sys.args values (29757, 1500
insert into sys.args values (29758, 1500, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1501, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (29759, 1501, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (29760, 1501, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (29760, 1501, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (29761, 1501, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (29762, 1501, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (29763, 1501, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -6010,6 +6010,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4963,7 +4963,7 @@ insert into sys.args values (26942, 1305
insert into sys.args values (26943, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26944, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26945, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26945, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26946, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26947, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26948, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5219,6 +5219,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('clock', 'tick') and type = 1;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlr') and name in ('master', 'stop', 'accept',
'replicate', 'beat') and type = 2;
+drop function json.text(string);
+drop function json.text(int);
+update "sys"."args" set "type" = 'ptr' where "func_id" = (select "id" from
"sys"."functions" where "name" = 'copyfrom' and "func" = 'copy_from' and "mod"
= 'sql') and "name" = 'arg_1';
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -4963,7 +4963,7 @@ insert into sys.args values (26942, 1305
insert into sys.args values (26943, 1305, 'arg_5', 'int', 32, 0, 1, 5);
insert into sys.functions values (1306, 'copyfrom', 'copy_from', 'sql', 0, 5,
false, true, false, 2000, true);
insert into sys.args values (26944, 1306, 'res_0', 'table', 0, 0, 0, 0);
-insert into sys.args values (26945, 1306, 'arg_1', 'varchar', 0, 0, 1, 1);
+insert into sys.args values (26945, 1306, 'arg_1', 'ptr', 0, 0, 1, 1);
insert into sys.args values (26946, 1306, 'arg_2', 'varchar', 0, 0, 1, 2);
insert into sys.args values (26947, 1306, 'arg_3', 'varchar', 0, 0, 1, 3);
insert into sys.args values (26948, 1306, 'arg_4', 'varchar', 0, 0, 1, 4);
@@ -5219,6 +5219,9 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'wlc') and name in ('master', 'stop', 'flush', 'beat')
and type = 2;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
