Changeset: 4945a3d488f8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4945a3d488f8
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
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-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: Mar2018
Log Message:
comment_on is not a system function.
diffs (228 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
@@ -1505,7 +1505,7 @@ sql_update_mar2018(Client c, mvc *sql)
"INSERT INTO sys.systemfunctions\n"
"SELECT id FROM sys.functions\n"
"WHERE schema_id = (SELECT id FROM sys.schemas WHERE
name = 'sys')\n"
- "AND name IN ('comment_on', 'function_type_keyword',
'no_op');\n"
+ "AND name IN ('function_type_keyword', 'no_op');\n"
"ALTER TABLE sys.keywords SET READ WRITE;\n"
"INSERT INTO sys.keywords VALUES ('COMMENT'),
('CONTINUE'), ('START'), ('TRUNCATE');\n"
"-- ALTER TABLE sys.keywords SET READ ONLY;\n"
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
@@ -5819,7 +5819,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
@@ -5814,7 +5814,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5106,7 +5106,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5106,7 +5106,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5869,7 +5869,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5869,7 +5869,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5819,7 +5819,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5106,7 +5106,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5106,7 +5106,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5869,7 +5869,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5817,7 +5817,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5101,7 +5101,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5101,7 +5101,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5864,7 +5864,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5819,7 +5819,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5101,7 +5101,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5101,7 +5101,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -5861,7 +5861,7 @@ ALTER TABLE sys.systemfunctions ALTER CO
INSERT INTO sys.systemfunctions
SELECT id FROM sys.functions
WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys')
-AND name IN ('comment_on', 'function_type_keyword', 'no_op');
+AND name IN ('function_type_keyword', 'no_op');
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('COMMENT'), ('CONTINUE'), ('START'),
('TRUNCATE');
-- ALTER TABLE sys.keywords SET READ ONLY;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
