Changeset: e95331389c9c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e95331389c9c
Added Files:
sql/test/Tests/comment-on-schema.sql
sql/test/Tests/comment-on-schema.stable.err
sql/test/Tests/comment-on-schema.stable.out
Modified Files:
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/storage/store.c
sql/test/Tests/All
sql/test/Tests/comment-on-table.sql
Branch: comment-on
Log Message:
Support COMMENT ON SCHEMA
diffs (288 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1929,31 +1929,42 @@ rel_alter_user(sql_allocator *sa, char *
return rel;
}
+
static sqlid
rel_commentable_object(mvc *sql, symbol *catalog_object) {
- assert(catalog_object->type == type_list);
- dlist *qname = catalog_object->data.lval;
- char *sname;
- char *tname;
- sql_schema *s = cur_schema(sql);
- sql_table *t;
switch (catalog_object->token) {
- case SQL_TABLE:
- sname = qname_schema(qname);
+ case SQL_SCHEMA: {
+ assert(catalog_object->type == type_string);
+ char *sname = catalog_object->data.sval;
+ sql_schema *s;
+ if (!(s = mvc_bind_schema(sql, sname))) {
+ sql_error(sql, 02, "3F000!COMMENT ON:no such
schema: %s", sname);
+ return 0;
+ }
+ return s->base.id;
+ }
+ case SQL_TABLE: {
+ assert(catalog_object->type == type_list);
+ dlist *qname = catalog_object->data.lval;
+ sql_schema *s = cur_schema(sql);
+ char *sname = qname_schema(qname);
if (sname && !(s = mvc_bind_schema(sql, sname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
schema: %s", sname);
return 0;
}
- tname = qname_table(qname);
+ char *tname = qname_table(qname);
+ sql_table *t;
if (!(t = mvc_bind_table(sql, s, tname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
table: %s.%s", s->base.name, tname);
return 0;
}
return t->base.id;
- default:
+ }
+ default: {
sql_error(sql, 2, "!COMMENT ON %s is not supported",
token2string(catalog_object->token));
return 0;
+ }
}
}
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -5431,6 +5431,7 @@ comment_on_statement:
catalog_object:
TABLE qname { $$ = _symbol_create_list( SQL_TABLE, $2); }
+ | SCHEMA ident { $$ = _symbol_create( SQL_SCHEMA, $2); }
;
XML_value_expression:
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4276,6 +4276,7 @@ sql_trans_drop_schema(sql_trans *tr, int
sys_drop_tables(tr, s, drop_action);
sys_drop_types(tr, s, drop_action);
sys_drop_sequences(tr, s, drop_action);
+ sql_trans_drop_any_comment(tr, s->base.id);
s->base.wtime = tr->wtime = tr->wstime;
tr->schema_updates ++;
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -101,6 +101,7 @@ median_stdev
ifexists
subqueries
comment-on-table
+comment-on-schema
#HAVE_GEOM?trace
diff --git a/sql/test/Tests/comment-on-schema.sql
b/sql/test/Tests/comment-on-schema.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-on-schema.sql
@@ -0,0 +1,36 @@
+DROP SCHEMA IF EXISTS sch;
+CREATE SCHEMA sch;
+SET SCHEMA sch;
+
+CREATE TABLE origs AS SELECT id FROM sys.comments;
+
+CREATE FUNCTION all_kinds_of_object()
+RETURNS TABLE (id INTEGER, name VARCHAR(30), type VARCHAR(20))
+RETURN TABLE (
+ SELECT id, name, table_type_name
+ FROM sys.tables, sys.table_types
+ WHERE type = table_type_id
+ UNION ALL
+ SELECT id, name, 'SCHEMA'
+ FROM sys.schemas
+);
+
+CREATE FUNCTION new_comments()
+RETURNS TABLE (name VARCHAR(30), source VARCHAR(20), remark CLOB)
+RETURN TABLE (
+ SELECT o.name, o.type, c.remark
+ FROM sys.comments AS c LEFT JOIN all_kinds_of_object() AS o ON c.id =
o.id
+ WHERE c.id NOT IN (SELECT id FROM origs)
+);
+
+------------------------------------------------------------------------
+
+-- create a schema and comment on it
+CREATE SCHEMA sch2;
+COMMENT ON SCHEMA sch2 IS 'yet another schema';
+SELECT * FROM new_comments();
+
+-- drop it by dropping the table
+COMMENT ON SCHEMA sch2 IS 'banana';
+DROP SCHEMA sch2;
+SELECT * FROM new_comments();
diff --git a/sql/test/Tests/comment-on-schema.stable.err
b/sql/test/Tests/comment-on-schema.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-on-schema.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'comment-on-schema` in directory 'sql/test` itself:
+
+
+# 13:49:54 >
+# 13:49:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30531" "--set"
"mapi_usock=/var/tmp/mtest-24642/.s.monetdb.30531" "--set" "monet_prompt="
"--forcemito" "--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test"
+# 13:49:54 >
+
+# builtin opt gdk_dbpath =
/Users/joeri/monets/default/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 30531
+# cmdline opt mapi_usock = /var/tmp/mtest-24642/.s.monetdb.30531
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/joeri/monets/default/var/MonetDB/mTests_sql_test
+# cmdline opt gdk_debug = 536870922
+
+# 13:49:54 >
+# 13:49:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24642" "--port=30531"
+# 13:49:54 >
+
+
+# 13:49:55 >
+# 13:49:55 > "Done."
+# 13:49:55 >
+
diff --git a/sql/test/Tests/comment-on-schema.stable.out
b/sql/test/Tests/comment-on-schema.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-on-schema.stable.out
@@ -0,0 +1,101 @@
+stdout of test 'comment-on-schema` in directory 'sql/test` itself:
+
+
+# 13:49:54 >
+# 13:49:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30531" "--set"
"mapi_usock=/var/tmp/mtest-24642/.s.monetdb.30531" "--set" "monet_prompt="
"--forcemito" "--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test"
+# 13:49:54 >
+
+# MonetDB 5 server v11.26.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test', using 8 threads
+# Compiled for x86_64-apple-darwin16.5.0/64bit with 128bit integers
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://dhcp-21.eduroam.cwi.nl:30531/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-24642/.s.monetdb.30531
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 97_comments.sql
+# loading sql script: 99_system.sql
+
+# 13:49:54 >
+# 13:49:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24642" "--port=30531"
+# 13:49:54 >
+
+#DROP SCHEMA IF EXISTS sch;
+#CREATE SCHEMA sch;
+#SET SCHEMA sch;
+#CREATE TABLE origs AS SELECT id FROM sys.comments;
+#CREATE FUNCTION all_kinds_of_object()
+#RETURNS TABLE (id INTEGER, name VARCHAR(30), type VARCHAR(20))
+#RETURN TABLE (
+# SELECT id, name, table_type_name
+# FROM sys.tables, sys.table_types
+# WHERE type = table_type_id
+# UNION ALL
+# SELECT id, name, 'SCHEMA'
+# FROM sys.schemas
+#);
+#CREATE FUNCTION new_comments()
+#RETURNS TABLE (name VARCHAR(30), source VARCHAR(20), remark CLOB)
+#RETURN TABLE (
+# SELECT o.name, o.type, c.remark
+# FROM sys.comments AS c LEFT JOIN all_kinds_of_object() AS o ON c.id =
o.id
+# WHERE c.id NOT IN (SELECT id FROM origs)
+#);
+#CREATE SCHEMA sch2;
+#SELECT * FROM new_comments();
+% .L1, .L1, .L1 # table_name
+% name, source, remark # name
+% varchar, varchar, clob # type
+% 4, 6, 18 # length
+[ "sch2", "SCHEMA", "yet another schema" ]
+#DROP SCHEMA sch2;
+#SELECT * FROM new_comments();
+% .L1, .L1, .L1 # table_name
+% name, source, remark # name
+% varchar, varchar, clob # type
+% 0, 0, 0 # length
+
+# 13:49:55 >
+# 13:49:55 > "Done."
+# 13:49:55 >
+
diff --git a/sql/test/Tests/comment-on-table.sql
b/sql/test/Tests/comment-on-table.sql
--- a/sql/test/Tests/comment-on-table.sql
+++ b/sql/test/Tests/comment-on-table.sql
@@ -10,6 +10,9 @@ RETURN TABLE (
SELECT id, name, table_type_name
FROM sys.tables, sys.table_types
WHERE type = table_type_id
+ UNION ALL
+ SELECT id, name, 'SCHEMA'
+ FROM sys.schemas
);
CREATE FUNCTION new_comments()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
