Changeset: 62d4d02a53d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62d4d02a53d2
Removed Files:
sql/test/Tests/comment-on-index.sql
sql/test/Tests/comment-on-index.stable.err
sql/test/Tests/comment-on-index.stable.out
Modified Files:
clients/mapiclient/dump.c
sql/test/Tests/comment-on.sql
sql/test/Tests/comment-on.stable.out
Branch: comment-on
Log Message:
Describe COMMENT ON index
diffs (truncated from 301 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
@@ -839,9 +839,11 @@ describe_table(Mapi mid, char *schema, c
"SELECT i.name, " /* 0 */
"k.name, " /* 1 */
"kc.nr, " /* 2 */
- "c.name " /* 3 */
- "FROM sys.idxs AS i LEFT JOIN sys.keys AS k "
- "ON i.name = k.name, "
+ "c.name, " /* 3 */
+ "rem.remark " /* 4 */
+ "FROM sys.idxs AS i "
+ "LEFT JOIN sys.keys AS k ON i.name = k.name "
+ "LEFT OUTER JOIN sys.comments rem ON i.id =
rem.id, "
"sys.objects AS kc, "
"sys._columns AS c, "
"sys.schemas s, "
@@ -863,6 +865,7 @@ describe_table(Mapi mid, char *schema, c
char *k_name = mapi_fetch_field(hdl, 1);
char *kc_nr = mapi_fetch_field(hdl, 2);
char *c_name = mapi_fetch_field(hdl, 3);
+ char *remark = mapi_fetch_field(hdl, 4);
if (mapi_error(mid))
goto bailout;
@@ -877,6 +880,7 @@ describe_table(Mapi mid, char *schema, c
mnstr_printf(toConsole,
"CREATE INDEX \"%s\" ON
\"%s\".\"%s\" (",
i_name, schema, tname);
+ append_comment(comments, "INDEX", schema,
i_name, NULL, NULL, remark);
cnt = 1;
} else
mnstr_printf(toConsole, ", ");
diff --git a/sql/test/Tests/comment-on-index.sql
b/sql/test/Tests/comment-on-index.sql
deleted file mode 100644
--- a/sql/test/Tests/comment-on-index.sql
+++ /dev/null
@@ -1,60 +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 an index and comment on it
-CREATE TABLE tab (i INTEGER);
-CREATE INDEX idx ON tab(i);
-COMMENT ON INDEX idx IS 'an index';
-SELECT * FROM new_comments();
-
--- explicit schema
-COMMENT ON INDEX sch.idx IS 'a qualified index';
-SELECT * FROM new_comments();
-
--- check that deletes cascade
-DROP INDEX idx;
-SELECT * FROM new_comments();
-
--- full cascade
-CREATE INDEX idx ON tab(i);
-COMMENT ON INDEX idx IS 'an index';
-DROP TABLE tab;
-SELECT * FROM new_comments();
diff --git a/sql/test/Tests/comment-on-index.stable.err
b/sql/test/Tests/comment-on-index.stable.err
deleted file mode 100644
--- a/sql/test/Tests/comment-on-index.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'comment-on-index` in directory 'sql/test` itself:
-
-
-# 13:19:30 >
-# 13:19:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33602" "--set"
"mapi_usock=/var/tmp/mtest-62171/.s.monetdb.33602" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
-# 13:19:30 >
-
-# 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 = 33602
-# cmdline opt mapi_usock = /var/tmp/mtest-62171/.s.monetdb.33602
-# 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
-
-# 13:19:31 >
-# 13:19:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-62171" "--port=33602"
-# 13:19:31 >
-
-
-# 13:19:32 >
-# 13:19:32 > "Done."
-# 13:19:32 >
-
diff --git a/sql/test/Tests/comment-on-index.stable.out
b/sql/test/Tests/comment-on-index.stable.out
deleted file mode 100644
--- a/sql/test/Tests/comment-on-index.stable.out
+++ /dev/null
@@ -1,122 +0,0 @@
-stdout of test 'comment-on-index` in directory 'sql/test` itself:
-
-
-# 13:19:30 >
-# 13:19:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33602" "--set"
"mapi_usock=/var/tmp/mtest-62171/.s.monetdb.33602" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
-# 13:19:30 >
-
-# 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:33602/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-62171/.s.monetdb.33602
-# 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
-
-# 13:19:31 >
-# 13:19:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-62171" "--port=33602"
-# 13:19:31 >
-
-#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 i.id, t.name || '.' || i.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 TABLE tab (i INTEGER);
-#CREATE INDEX idx ON tab(i);
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 3, 5, 8 # length
-[ "idx", "INDEX", "an index" ]
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 3, 5, 17 # length
-[ "idx", "INDEX", "a qualified index" ]
-#DROP INDEX idx;
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 0, 0, 0 # length
-#CREATE INDEX idx ON tab(i);
-#DROP TABLE tab;
-#SELECT * FROM new_comments();
-% .L1, .L1, .L1 # table_name
-% name, source, remark # name
-% varchar, varchar, clob # type
-% 0, 0, 0 # length
-
-# 13:19:32 >
-# 13:19:32 > "Done."
-# 13:19:32 >
-
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
@@ -85,6 +85,11 @@ COMMENT ON COLUMN tab.j IS 'jj';
COMMENT ON COLUMN foo.tab.i IS 'ii';
\d tab
+/* comment on index works */
+CREATE INDEX idx ON tab(j,i);
+COMMENT ON INDEX idx IS 'index on j';
+\d tab
+
/* comment on sequence works */
CREATE SEQUENCE counter AS INT;
\ds
diff --git a/sql/test/Tests/comment-on.stable.out
b/sql/test/Tests/comment-on.stable.out
--- a/sql/test/Tests/comment-on.stable.out
+++ b/sql/test/Tests/comment-on.stable.out
@@ -122,6 +122,16 @@ CREATE TABLE "foo"."tab" (
COMMENT ON TABLE "foo"."tab" IS 'table';
COMMENT ON COLUMN "foo"."tab"."i" IS 'ii';
COMMENT ON COLUMN "foo"."tab"."j" IS 'jj';
+#CREATE INDEX idx ON tab(j,i);
+CREATE TABLE "foo"."tab" (
+ "i" INTEGER,
+ "j" DECIMAL(4,2)
+);
+CREATE INDEX "idx" ON "foo"."tab" ("j", "i");
+COMMENT ON TABLE "foo"."tab" IS 'table';
+COMMENT ON COLUMN "foo"."tab"."i" IS 'ii';
+COMMENT ON COLUMN "foo"."tab"."j" IS 'jj';
+COMMENT ON INDEX "foo"."idx" IS 'index on j';
#CREATE SEQUENCE counter AS INT;
SEQUENCE foo.counter
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
