Changeset: 7e8be5c834ba for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e8be5c834ba
Removed Files:
sql/test/Tests/comment-on-sequence.sql
sql/test/Tests/comment-on-sequence.stable.err
sql/test/Tests/comment-on-sequence.stable.out
Modified Files:
clients/mapiclient/dump.c
sql/test/Tests/comment-on.sql
sql/test/Tests/comment-on.stable.err
sql/test/Tests/comment-on.stable.out
Branch: comment-on
Log Message:
Support COMMENT ON SEQUENCE
diffs (truncated from 338 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -929,6 +929,7 @@ describe_sequence(Mapi mid, char *schema
char *query;
size_t maxquerylen;
char *sname = NULL;
+ comment_buffer *comments = comment_buffer_create();
if (schema == NULL) {
if ((sname = strchr(tname, '.')) != NULL) {
@@ -954,8 +955,9 @@ describe_sequence(Mapi mid, char *schema
"seq.\"minvalue\", "
"seq.\"maxvalue\", "
"seq.\"increment\", "
- "seq.\"cycle\" "
- "FROM sys.sequences seq, "
+ "seq.\"cycle\", "
+ "rem.\"remark\" "
+ "FROM sys.sequences seq LEFT OUTER JOIN sys.comments rem ON
seq.id = rem.id, "
"sys.schemas s "
"WHERE s.id = seq.schema_id AND "
"s.name = '%s' AND "
@@ -974,6 +976,7 @@ describe_sequence(Mapi mid, char *schema
char *maxvalue = mapi_fetch_field(hdl, 4);
char *increment = mapi_fetch_field(hdl, 5);
char *cycle = mapi_fetch_field(hdl, 6);
+ char *remark = mapi_fetch_field(hdl, 7);
mnstr_printf(toConsole,
"CREATE SEQUENCE \"%s\".\"%s\" START WITH %s",
@@ -985,12 +988,15 @@ describe_sequence(Mapi mid, char *schema
if (strcmp(maxvalue, "0") != 0)
mnstr_printf(toConsole, " MAXVALUE %s", maxvalue);
mnstr_printf(toConsole, " %sCYCLE;\n", strcmp(cycle, "true") ==
0 ? "" : "NO ");
+ append_comment(comments, "SEQUENCE", schema, tname, NULL, NULL,
remark);
if (mnstr_errnr(toConsole)) {
mapi_close_handle(hdl);
hdl = NULL;
goto bailout;
}
}
+ write_comment_buffer(toConsole, comments);
+ comment_buffer_destroy(comments);
if (mapi_error(mid))
goto bailout;
if (sname != NULL)
@@ -1002,6 +1008,7 @@ describe_sequence(Mapi mid, char *schema
return 0;
bailout:
+ comment_buffer_destroy(comments);
if (hdl) {
if (mapi_result_error(hdl))
mapi_explain_result(hdl, stderr);
diff --git a/sql/test/Tests/comment-on-sequence.sql
b/sql/test/Tests/comment-on-sequence.sql
deleted file mode 100644
--- a/sql/test/Tests/comment-on-sequence.sql
+++ /dev/null
@@ -1,53 +0,0 @@
-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(80), type VARCHAR(30))
-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
- UNION ALL
- SELECT c.id, t.name || '.' || c.name, 'COLUMN'
- FROM sys.columns AS c, sys.tables AS t
- WHERE c.table_id = t.id
- UNION ALL
- SELECT id, name, 'INDEX'
- FROM sys.idxs
- UNION ALL
- SELECT id, name, 'SEQUENCE'
- FROM sys.sequences
- UNION ALL
- SELECT id, name, function_type_name
- FROM sys.functions, sys.function_types
- WHERE type = function_type_id
-);
-
-CREATE FUNCTION new_comments()
-RETURNS TABLE (name VARCHAR(80), source VARCHAR(30), 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 sequence and comment on it
-CREATE SEQUENCE seq AS INT;
-COMMENT ON SEQUENCE seq IS 'a few numbers';
-SELECT * FROM new_comments();
-
--- explicit schema
-COMMENT ON SEQUENCE sch.seq IS 'a few more numbers';
-SELECT * FROM new_comments();
-
--- check that deletes cascade
-DROP SEQUENCE seq;
-SELECT * FROM new_comments();
diff --git a/sql/test/Tests/comment-on-sequence.stable.err
b/sql/test/Tests/comment-on-sequence.stable.err
deleted file mode 100644
--- a/sql/test/Tests/comment-on-sequence.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'comment-on-sequence` in directory 'sql/test` itself:
-
-
-# 10:43:02 >
-# 10:43:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30332" "--set"
"mapi_usock=/var/tmp/mtest-7368/.s.monetdb.30332" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
-# 10:43:02 >
-
-# 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 = 30332
-# cmdline opt mapi_usock = /var/tmp/mtest-7368/.s.monetdb.30332
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/Users/joeri/monets/default/var/MonetDB/mTests_sql_test
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 10:43:02 >
-# 10:43:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7368" "--port=30332"
-# 10:43:02 >
-
-
-# 10:43:03 >
-# 10:43:03 > "Done."
-# 10:43:03 >
-
diff --git a/sql/test/Tests/comment-on-sequence.stable.out
b/sql/test/Tests/comment-on-sequence.stable.out
deleted file mode 100644
--- a/sql/test/Tests/comment-on-sequence.stable.out
+++ /dev/null
@@ -1,114 +0,0 @@
-stdout of test 'comment-on-sequence` in directory 'sql/test` itself:
-
-
-# 10:43:02 >
-# 10:43:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30332" "--set"
"mapi_usock=/var/tmp/mtest-7368/.s.monetdb.30332" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
-# 10:43:02 >
-
-# MonetDB 5 server v11.28.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test', using 8 threads
-# Compiled for x86_64-apple-darwin16.7.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 https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://dhcp-62.eduroam.cwi.nl:30332/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7368/.s.monetdb.30332
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/R 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: 60_wlcr.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
-
-# 10:43:02 >
-# 10:43:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7368" "--port=30332"
-# 10:43:02 >
-
-#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(80), 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
-# UNION ALL
-# SELECT c.id, t.name || '.' || c.name, 'COLUMN'
-# FROM sys.columns AS c, sys.tables AS t
-# WHERE c.table_id = t.id
-# UNION ALL
-# SELECT id, name, 'INDEX'
-#CREATE FUNCTION new_comments()
-#RETURNS TABLE (name VARCHAR(80), 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 SEQUENCE seq AS INT;
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 3, 8, 13 # length
-[ "seq", "SEQUENCE", "a few numbers" ]
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 3, 8, 18 # length
-[ "seq", "SEQUENCE", "a few more numbers" ]
-#DROP SEQUENCE seq;
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 0, 0, 0 # length
-
-# 10:43:03 >
-# 10:43:03 > "Done."
-# 10:43:03 >
-
diff --git a/sql/test/Tests/comment-on.sql b/sql/test/Tests/comment-on.sql
--- a/sql/test/Tests/comment-on.sql
+++ b/sql/test/Tests/comment-on.sql
@@ -84,3 +84,17 @@ COMMENT ON TABLE tmp.tempo IS 'temporary
COMMENT ON COLUMN tab.j IS 'jj';
COMMENT ON COLUMN foo.tab.i IS 'ii';
\d tab
+
+/* comment on sequence works */
+CREATE SEQUENCE counter AS INT;
+\ds
+COMMENT ON SEQUENCE counter IS 'counting';
+\ds
+\ds counter
+
+/* comment on schema.sequence also works */
+SET SCHEMA sys;
+COMMENT ON SEQUENCE foo.counter IS NULL;
+SET SCHEMA foo;
+\ds
+
diff --git a/sql/test/Tests/comment-on.stable.err
b/sql/test/Tests/comment-on.stable.err
--- a/sql/test/Tests/comment-on.stable.err
+++ b/sql/test/Tests/comment-on.stable.err
@@ -30,19 +30,19 @@ stderr of test 'comment-on` in directory
MAPI = (monetdb) /var/tmp/mtest-10547/.s.monetdb.37253
QUERY = COMMENT ON VIEW tab IS '';
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
