Changeset: 5c227246f5e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5c227246f5e6
Modified Files:
clients/odbc/driver/SQLGetInfo.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/10_sys_schema_extension.sql
sql/server/sql_scan.c
sql/storage/store.c
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
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
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/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
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
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.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.int128
Branch: default
Log Message:
Removed LANGUAGE keyword.
diffs (truncated from 448 to 300 lines):
diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c
--- a/clients/odbc/driver/SQLGetInfo.c
+++ b/clients/odbc/driver/SQLGetInfo.c
@@ -686,7 +686,7 @@ MNDBGetInfo(ODBCDbc *dbc,
"'GET','GLOBAL','GO','GOTO','GRANT','GROUP','HAVING','HOUR',"
"'IDENTITY','IMMEDIATE','IN','INCLUDE','INDEX','INDICATOR','INITIALLY','INNER','INPUT',"
"'INSENSITIVE','INSERT','INT','INTEGER','INTERSECT','INTERVAL','INTO','IS','ISOLATION',"
-
"'JOIN','KEY','LANGUAGE','LAST','LEADING','LEFT','LEVEL','LIKE','LOCAL','LOWER',"
+
"'JOIN','KEY','LAST','LEADING','LEFT','LEVEL','LIKE','LOCAL','LOWER',"
"'MATCH','MAX','MIN','MINUTE','MODULE','MONTH',"
"'NAMES','NATIONAL','NATURAL','NCHAR','NEXT','NO','NONE','NOT','NULL','NULLIF','NUMERIC',"
"'OCTET_LENGTH','OF','ON','ONLY','OPEN','OPTION','OR','ORDER','OUTER','OUTPUT','OVERLAPS',"
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
@@ -5539,11 +5539,14 @@ sql_update_default(Client c, mvc *sql, s
if ((b = BBPquickdesc(output->cols[0].b)) && BATcount(b) > 0) {
static const char query1[] =
"ALTER TABLE sys.function_languages SET READ WRITE;\n"
+ "ALTER TABLE sys.keywords SET READ WRITE;\n"
"COMMIT;\n";
static const char query2[] =
"DELETE FROM sys.function_languages WHERE language_name
IN ('Python', 'Python3', 'R', 'C', 'C++');\n"
+ "DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';\n"
"COMMIT;\n";
- static const char query3[] = "ALTER TABLE
sys.function_languages SET READ ONLY;\n";
+ static const char query3[] = "ALTER TABLE
sys.function_languages SET READ ONLY;\n"
+ "ALTER TABLE sys.keywords SET READ ONLY;\n";
printf("Running database upgrade commands:\n%s%s%s\n", query1,
query2, query3);
fflush(stdout);
err = SQLstatementIntern(c, query1, "update", true, false,
NULL);
diff --git a/sql/scripts/10_sys_schema_extension.sql
b/sql/scripts/10_sys_schema_extension.sql
--- a/sql/scripts/10_sys_schema_extension.sql
+++ b/sql/scripts/10_sys_schema_extension.sql
@@ -147,7 +147,6 @@ INSERT INTO sys.keywords (keyword) VALUE
('ISOLATION'),
('JOIN'),
('KEY'),
- ('LANGUAGE'),
('LARGE'),
('LAST'),
('LATERAL'),
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -1200,8 +1200,6 @@ int scanner_symbol(mvc * c, int cur)
case '"':
return scanner_string(c, cur, false);
case '{':
- // if previous tokens like LANGUAGE IDENT
- // TODO checking on IDENT only may not be enough
lc->started = 1;
return scanner_token(lc, cur);
case '}':
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1989,7 +1989,7 @@ store_load(sqlstore *store, allocator *p
bootstrap_create_column(tr, t, "func", 2019, "varchar", 8196)
== NULL ||
bootstrap_create_column(tr, t, "mod", 2020, "varchar", 8196) ==
NULL ||
- /* language asm=0, sql=1, R=2, C=3, J=4 */
+ /* language internal C=0, mal=1, sql=2 */
bootstrap_create_column(tr, t, "language", 2021, "int", 31) ==
NULL ||
/* func, proc, aggr or filter */
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
@@ -378,8 +378,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -378,8 +378,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -463,8 +463,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -380,8 +380,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -380,8 +380,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -463,8 +463,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
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
@@ -94,8 +94,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+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
@@ -94,8 +94,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+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
@@ -179,8 +179,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+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
@@ -94,8 +94,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+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
@@ -94,8 +94,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+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
@@ -179,8 +179,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -5353,7 +5353,6 @@ select 'null in fkeys.delete_action', de
[ "sys.keywords", "ISOLATION" ]
[ "sys.keywords", "JOIN" ]
[ "sys.keywords", "KEY" ]
-[ "sys.keywords", "LANGUAGE" ]
[ "sys.keywords", "LARGE" ]
[ "sys.keywords", "LAST" ]
[ "sys.keywords", "LATERAL" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -5496,7 +5496,6 @@ select 'null in fkeys.delete_action', de
[ "sys.keywords", "ISOLATION" ]
[ "sys.keywords", "JOIN" ]
[ "sys.keywords", "KEY" ]
-[ "sys.keywords", "LANGUAGE" ]
[ "sys.keywords", "LARGE" ]
[ "sys.keywords", "LAST" ]
[ "sys.keywords", "LATERAL" ]
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
@@ -378,8 +378,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -378,8 +378,11 @@ ALTER TABLE sys.function_types SET READ
Running database upgrade commands:
ALTER TABLE sys.function_languages SET READ WRITE;
+ALTER TABLE sys.keywords SET READ WRITE;
COMMIT;
DELETE FROM sys.function_languages WHERE language_name IN ('Python',
'Python3', 'R', 'C', 'C++');
+DELETE FROM sys.keywords WHERE keyword = 'LANGUAGE';
COMMIT;
ALTER TABLE sys.function_languages SET READ ONLY;
+ALTER TABLE sys.keywords SET READ ONLY;
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
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
