Changeset: fe568720cef5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe568720cef5
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/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.int128
Branch: Dec2016
Log Message:
Fix upgrade code and approve upgrade output.
diffs (153 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
@@ -2201,12 +2201,14 @@ sql_update_dec2016_sp3(Client c, mvc *sq
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
- "drop procedure sys.settimeout(bigint);"
- "drop procedure sys.settimeout(bigint,bigint);"
- "drop procedure sys.setsession(bigint);"
- "create procedure sys.settimeout(\"query\" bigint)
external name clients.settimeout;"
- "create procedure sys.settimeout(\"query\" bigint,
\"session\" bigint) external name clients.settimeout;"
- "create procedure sys.setsession(\"timeout\" bigint)
external name clients.setsession;");
+ "drop procedure sys.settimeout(bigint);\n"
+ "drop procedure sys.settimeout(bigint,bigint);\n"
+ "drop procedure sys.setsession(bigint);\n"
+ "create procedure sys.settimeout(\"query\" bigint)
external name clients.settimeout;\n"
+ "create procedure sys.settimeout(\"query\" bigint,
\"session\" bigint) external name clients.settimeout;\n"
+ "create procedure sys.setsession(\"timeout\" bigint)
external name clients.setsession;\n"
+ "insert into sys.systemfunctions (select id from
sys.functions where name in ('settimeout', 'setsession') and schema_id =
(select id from sys.schemas where name = 'sys') and id not in (select
function_id from sys.systemfunctions));\n"
+ "delete from systemfunctions where function_id not in
(select id from functions);\n");
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
assert(pos < bufsize);
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
@@ -24,6 +24,18 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "sys";
+
# 15:26:18 >
# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21187" "--port=38946"
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
@@ -24,6 +24,17 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "sys";
# 15:41:19 >
# 15:41:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7576" "--port=32696"
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
@@ -68,6 +68,18 @@ insert into sys.types values (13, 'hge',
insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 0);
set schema "sys";
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "sys";
+
# 16:53:35 >
# 16:53:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30908" "--port=39660"
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
@@ -22,6 +22,17 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "testschema";
# 15:26:22 >
# 15:26:22 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -19,6 +19,17 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "testschema";
# 16:00:57 >
# 16:00:57 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -63,6 +63,18 @@ insert into sys.types values (13, 'hge',
insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 0);
set schema "testschema";
+Running database upgrade commands:
+set schema "sys";
+drop procedure sys.settimeout(bigint);
+drop procedure sys.settimeout(bigint,bigint);
+drop procedure sys.setsession(bigint);
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+insert into sys.systemfunctions (select id from sys.functions where name in
('settimeout', 'setsession') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
+delete from systemfunctions where function_id not in (select id from
functions);
+set schema "testschema";
+
# 12:48:11 >
# 12:48:11 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
