Changeset: 4cfa16cbac2f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4cfa16cbac2f
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/51_sys_schema_extension.sql
Branch: Jun2016
Log Message:
A new dependency TYPE_DEPENDENCY has been added in
dev/sql/include/sql_catalog.h.
This also needs to be added to the sys.dependency_types table population
script: 51_sys_schema_extension.sql
Also extended the upgrade program with SQL statements to insert rows into
both the sys.dependency_types and sys.dependencies tables.
diffs (31 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
@@ -1332,6 +1332,18 @@ sql_update_jun2016(Client c, mvc *sql)
"('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'),
('WRITE'),\n"
"('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'),
('XMLDOCUMENT'), ('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'),
('XMLPARSE'), ('XMLPI'), ('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'),
('XMLVALIDATE');\n");
+ // Add new dependency_type 15 to table sys.dependency_types
+ pos += snprintf(buf + pos, bufsize - pos,
+ "insert into sys.dependency_types (dependency_type_id,
dependency_type_name)\n"
+ " select 15 as id, 'TYPE' as name where 15 not in (select
dependency_type_id from sys.dependency_types);\n");
+
+ // Add 46 missing sys.dependencies rows for new dependency_type: 15
+ pos += snprintf(buf + pos, bufsize - pos,
+ "insert into sys.dependencies (id, depend_id, depend_type)\n"
+ " select distinct types.id as type_id, args.func_id, 15 as
depend_type from sys.args join sys.types on types.systemname = args.type where
args.type in ('inet', 'json', 'url', 'uuid')\n"
+ " except\n"
+ " select distinct id, depend_id, depend_type from
sys.dependencies where depend_type = 15;\n");
+
// Add the new storage inspection functions.
pos += snprintf(buf + pos, bufsize - pos,
"create function sys.\"storage\"( sname string)\n"
diff --git a/sql/scripts/51_sys_schema_extension.sql
b/sql/scripts/51_sys_schema_extension.sql
--- a/sql/scripts/51_sys_schema_extension.sql
+++ b/sql/scripts/51_sys_schema_extension.sql
@@ -54,4 +54,4 @@ CREATE TABLE sys.dependency_types (
INSERT INTO sys.dependency_types (dependency_type_id, dependency_type_name)
VALUES
-- values taken from sql_catalog.h
(1, 'SCHEMA'), (2, 'TABLE'), (3, 'COLUMN'), (4, 'KEY'), (5, 'VIEW'), (6,
'USER'), (7, 'FUNCTION'), (8, 'TRIGGER'),
- (9, 'OWNER'), (10, 'INDEX'), (11, 'FKEY'), (12, 'SEQUENCE'), (13,
'PROCEDURE'), (14, 'BE_DROPPED');
+ (9, 'OWNER'), (10, 'INDEX'), (11, 'FKEY'), (12, 'SEQUENCE'), (13,
'PROCEDURE'), (14, 'BE_DROPPED'), (15, 'TYPE');
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
