Changeset: cac85c3106f5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cac85c3106f5
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/99_system.sql
Branch: default
Log Message:
Avoid magic numbers.
diffs (28 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
@@ -1204,8 +1204,8 @@ sql_update_jun2016(Client c)
/* change to 99_system.sql: correct invalid FK schema ids, set them to
schema id 2000 (the "sys" schema) */
pos += snprintf(buf + pos, bufsize - pos,
- "UPDATE sys.types SET schema_id = 2000 WHERE
schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);\n"
- "UPDATE sys.functions SET schema_id = 2000 WHERE
schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);\n");
+ "UPDATE sys.types SET schema_id = (SELECT id FROM
sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN
(SELECT id from sys.schemas);\n"
+ "UPDATE sys.functions SET schema_id = (SELECT id FROM
sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN
(SELECT id from sys.schemas);\n");
if (schema) {
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
diff --git a/sql/scripts/99_system.sql b/sql/scripts/99_system.sql
--- a/sql/scripts/99_system.sql
+++ b/sql/scripts/99_system.sql
@@ -16,8 +16,8 @@ update _tables set system = true;
update schemas set system = true;
-- correct invalid FK schema ids, set them to schema id 2000 (the "sys" schema)
-UPDATE sys.types SET schema_id = 2000 WHERE schema_id = 0 AND schema_id
NOT IN (SELECT id from sys.schemas);
-UPDATE sys.functions SET schema_id = 2000 WHERE schema_id = 0 AND schema_id
NOT IN (SELECT id from sys.schemas);
+UPDATE sys.types SET schema_id = (SELECT id FROM sys.schemas WHERE name =
'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);
+UPDATE sys.functions SET schema_id = (SELECT id FROM sys.schemas WHERE name =
'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);
-- make sure all gets commited
COMMIT;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
