Changeset: c4840f4eae31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c4840f4eae31
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.SQL.py
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-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: drop systemfunctions.
diffs (254 lines):
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -4878,4 +4878,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4878,4 +4878,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -4878,4 +4878,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/emptydb/Tests/check.SQL.py
b/sql/test/emptydb/Tests/check.SQL.py
--- a/sql/test/emptydb/Tests/check.SQL.py
+++ b/sql/test/emptydb/Tests/check.SQL.py
@@ -14,7 +14,6 @@ sys_pkeys = [
('_columns', 'id'),
('columns', 'id'),
('functions', 'id'),
- ('systemfunctions', 'function_id'),
('args', 'id'),
('types', 'id'),
('objects', 'id, nr'),
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
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
@@ -4878,4 +4878,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -4878,4 +4878,5 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
+drop view sys.systemfunctions;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
