Changeset: 7a5efe47dd6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a5efe47dd6a
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.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
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: default
Log Message:
Approve upgrade after changeset 414c573b979c.
diffs (truncated from 742 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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -96,6 +88,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 15:17:55 >
# 15:17:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6495" "--port=30245"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -96,6 +88,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 15:55:37 >
# 15:55:37 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12365" "--port=35877"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -96,6 +88,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 16:02:52 >
# 16:02:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5391" "--port=32916"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
@@ -5424,6 +5416,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 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/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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished reading the write-ahead log 'sql_logs/sql/log.31'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
@@ -5424,6 +5416,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 15:43:25 >
# 15:43:25 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5725" "--port=37647"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -89,6 +81,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 15:17:04 >
# 15:17:04 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4292" "--port=34610"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -82,9 +74,20 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
-# 15:55:36 >
-# 15:55:36 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12365" "--port=35877"
-# 15:55:36 >
+Running database upgrade commands:
+set schema sys;
+create function sys.remote_table_credentials (tablename string) returns table
("uri" string, "username" string, "hash" string) external name
sql.rt_credentials;
+insert into sys.systemfunctions (select id from sys.functions where
name='remote_table_credentials' and id not in (select function_id from
sys.systemfunctions));
+set schema "sys";
+commit;
+
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 21:10:45 >
+# 21:10:45 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16714" "--port=36212"
+# 21:10:45 >
#select 1;
% .L2 # table_name
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -89,6 +81,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 16:02:52 >
# 16:02:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5391" "--port=32916"
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
@@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished reading the write-ahead log 'sql_logs/sql/log.3'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
delete from sys.dependencies where id < 2000;
@@ -5417,6 +5409,9 @@ insert into sys.systemfunctions (select
set schema "sys";
commit;
+# MonetDB/SQL module loaded
+
+Ready.
# 18:26:24 >
# 18:26:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20759" "--port=37815"
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
@@ -16,12 +16,6 @@ stdout of test 'upgrade` in directory 's
# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:37689/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31771/.s.monetdb.37689
# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
Running database upgrade commands:
set schema "sys";
drop function sys.dependencies_functions_os_triggers();
@@ -30,7 +24,7 @@ RETURNS TABLE (sch varchar(100), usr var
RETURN TABLE (SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f,
triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id
=tri.id AND dep.depend_type = 8);
insert into sys.systemfunctions (select id from sys.functions where name in
('dependencies_functions_on_triggers') 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";
+set schema "sys";
commit;
Running database upgrade commands:
@@ -67,7 +61,7 @@ SELECT d.id, i1.obj_type, i1.name,
ORDER BY id, depend_id;
GRANT SELECT ON sys.dependencies_vw TO PUBLIC;
update sys._tables set system = true where name in ('ids', 'dependencies_vw')
and schema_id in (select id from sys.schemas where name = 'sys');
-set schema "testschema";
+set schema "sys";
commit;
Running database upgrade commands:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
