Changeset: 0519a4b8cc11 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0519a4b8cc11
Modified Files:
clients/mapiclient/dump.c
Branch: system-functions
Log Message:
Use comments from WITH statement instead of sys.comments.
diffs (102 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -854,7 +854,7 @@ describe_table(Mapi mid, const char *sch
snprintf(query, maxquerylen,
"%s "
"SELECT t.name, t.query, t.type, c.remark "
- "FROM sys.schemas s, sys._tables t LEFT OUTER JOIN
sys.comments c ON t.id = c.id "
+ "FROM sys.schemas s, sys._tables t LEFT OUTER JOIN comments c
ON t.id = c.id "
"WHERE s.name = '%s' AND "
"t.schema_id = s.id AND "
"t.name = '%s'",
@@ -998,7 +998,7 @@ describe_table(Mapi mid, const char *sch
mnstr_printf(toConsole, ");\n");
snprintf(query, maxquerylen,
"%s "
- "SELECT i.name, c.remark FROM sys.idxs i, sys.comments
c WHERE i.id = c.id AND i.table_id = (SELECT id FROM sys._tables WHERE
schema_id = (select id FROM sys.schemas WHERE name = '%s') AND name = '%s')
ORDER BY i.name",
+ "SELECT i.name, c.remark FROM sys.idxs i, comments c
WHERE i.id = c.id AND i.table_id = (SELECT id FROM sys._tables WHERE schema_id
= (select id FROM sys.schemas WHERE name = '%s') AND name = '%s') ORDER BY
i.name",
get_compat_clause(mid),
schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
@@ -1014,7 +1014,7 @@ describe_table(Mapi mid, const char *sch
snprintf(query, maxquerylen,
"%s "
- "SELECT col.name, com.remark FROM sys._columns col,
sys.comments com WHERE col.id = com.id AND col.table_id = (SELECT id FROM
sys._tables WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = '%s')
AND name = '%s') ORDER BY number",
+ "SELECT col.name, com.remark FROM sys._columns col,
comments com WHERE col.id = com.id AND col.table_id = (SELECT id FROM
sys._tables WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = '%s')
AND name = '%s') ORDER BY number",
get_compat_clause(mid),
schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
@@ -1094,7 +1094,7 @@ describe_sequence(Mapi mid, const char *
"seq.\"increment\", "
"seq.\"cycle\", "
"rem.\"remark\" "
- "FROM sys.sequences seq LEFT OUTER JOIN sys.comments rem ON
seq.id = rem.id, "
+ "FROM sys.sequences seq LEFT OUTER JOIN comments rem ON seq.id
= rem.id, "
"sys.schemas s "
"WHERE s.id = seq.schema_id AND "
"s.name = '%s' AND "
@@ -1169,7 +1169,7 @@ describe_schema(Mapi mid, const char *sn
"%s "
"SELECT s.name, a.name, c.remark "
"FROM sys.auths a, "
- "sys.schemas s LEFT OUTER JOIN sys.comments c ON s.id =
c.id "
+ "sys.schemas s LEFT OUTER JOIN comments c ON s.id = c.id "
"WHERE s.\"authorization\" = a.id AND "
"s.name = '%s' "
"ORDER BY s.name",
@@ -1398,7 +1398,7 @@ dump_function_comment(Mapi mid, stream *
" CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number
DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark,"
" ROW_NUMBER() OVER (ORDER BY f.id, p.number) AS line"
" FROM sys.functions f"
- " JOIN sys.comments c ON f.id = c.id"
+ " JOIN comments c ON f.id = c.id"
" JOIN sys.schemas s ON f.schema_id = s.id"
" LEFT OUTER JOIN sys.function_types ft ON f.type =
ft.function_type_id"
" LEFT OUTER JOIN sys.args p ON f.id = p.func_id AND p.inout =
1"
@@ -1630,7 +1630,7 @@ dump_functions(Mapi mid, stream *toConso
"SELECT s.id, s.name, f.id, LENGTH(rem.remark) AS remark_len "
"FROM sys.schemas s "
"JOIN sys.functions f ON s.id = f.schema_id "
- "LEFT OUTER JOIN sys.comments rem ON f.id = rem.id "
+ "LEFT OUTER JOIN comments rem ON f.id = rem.id "
"WHERE f.language > 0");
if (sname)
q += snprintf(q, end_q - q, " AND s.name = '%s'", sname);
@@ -1804,7 +1804,7 @@ dump_database(Mapi mid, stream *toConsol
"ORDER BY s.name, f.name, a.name, g.name, p.grantable";
const char *schemas =
"SELECT s.name, a.name, rem.remark "
- "FROM sys.schemas s LEFT OUTER JOIN sys.comments rem ON s.id =
rem.id, "
+ "FROM sys.schemas s LEFT OUTER JOIN comments rem ON s.id =
rem.id, "
"sys.auths a "
"WHERE s.\"authorization\" = a.id AND "
"s.system = FALSE "
@@ -1812,7 +1812,7 @@ dump_database(Mapi mid, stream *toConsol
const char *sequences1 =
"SELECT sch.name,seq.name, rem.remark "
"FROM sys.schemas sch, "
- "sys.sequences seq LEFT OUTER JOIN sys.comments rem ON
seq.id = rem.id "
+ "sys.sequences seq LEFT OUTER JOIN comments rem ON seq.id
= rem.id "
"WHERE sch.id = seq.schema_id "
"ORDER BY sch.name,seq.name";
const char *sequences2 =
@@ -1850,7 +1850,7 @@ dump_database(Mapi mid, stream *toConsol
"t.query AS query, "
"rem.remark AS remark "
"FROM sys.schemas s, "
- "sys._tables t LEFT OUTER JOIN sys.comments rem ON
t.id = rem.id "
+ "sys._tables t LEFT OUTER JOIN comments rem ON
t.id = rem.id "
"WHERE t.type = 1 AND "
"t.system = FALSE AND "
"s.id = t.schema_id AND "
@@ -1886,7 +1886,7 @@ dump_database(Mapi mid, stream *toConsol
"t.query AS query, "
"rem.remark AS remark "
"FROM sys.schemas s, "
- "sys._tables t LEFT OUTER JOIN sys.comments rem ON
t.id = rem.id "
+ "sys._tables t LEFT OUTER JOIN comments rem ON
t.id = rem.id "
"WHERE t.type = 1 AND "
"t.system = FALSE AND "
"s.id = t.schema_id AND "
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
