Changeset: cf35943f7eea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf35943f7eea
Modified Files:
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: default
Log Message:
Merge with Jul2017 branch.
diffs (128 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
@@ -24,17 +24,6 @@ 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";
Running database upgrade commands:
set schema "sys";
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,17 +24,6 @@ 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";
Running database upgrade commands:
set schema "sys";
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
@@ -70,18 +70,6 @@ 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";
-
-Running database upgrade commands:
-set schema "sys";
delete from sys._columns where table_id = (select id from sys._tables where
name = 'connections' and schema_id = (select id from sys.schemas where name =
'sys'));
delete from sys._tables where name = 'connections' and schema_id = (select id
from sys.schemas where name = 'sys');
drop function sys.malfunctions;
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,17 +22,6 @@ 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";
Running database upgrade commands:
set schema "sys";
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,17 +19,6 @@ 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";
Running database upgrade commands:
set schema "sys";
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
@@ -65,18 +65,6 @@ 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";
-
-Running database upgrade commands:
-set schema "sys";
delete from sys._columns where table_id = (select id from sys._tables where
name = 'connections' and schema_id = (select id from sys.schemas where name =
'sys'));
delete from sys._tables where name = 'connections' and schema_id = (select id
from sys.schemas where name = 'sys');
drop function sys.malfunctions;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
