Changeset: d515740acae1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d515740acae1
Added Files:
sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.err
sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.out
Modified Files:
clients/mapiclient/dump.c
geom/monetdb5/geom.c
sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (truncated from 705 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
@@ -316,17 +316,17 @@ dump_foreign_keys(Mapi mid, const char *
"sys.keys pkk, "
"sys.schemas ps, "
"sys.schemas fs "
- "WHERE fkt.id = fkk.table_id AND "
- "pkt.id = pkk.table_id AND "
- "fkk.id = fkkc.id AND "
- "pkk.id = pkkc.id AND "
- "fkk.rkey = pkk.id AND "
- "fkkc.nr = pkkc.nr AND "
- "pkt.schema_id = ps.id AND "
- "fkt.schema_id = fs.id AND "
- "fs.name = '%s' AND "
- "fkt.name = '%s' "
- "ORDER BY fkk.name, nr", schema, tname);
+ "WHERE fkt.id = fkk.table_id "
+ "AND pkt.id = pkk.table_id "
+ "AND fkk.id = fkkc.id "
+ "AND pkk.id = pkkc.id "
+ "AND fkk.rkey = pkk.id "
+ "AND fkkc.nr = pkkc.nr "
+ "AND pkt.schema_id = ps.id "
+ "AND fkt.schema_id = fs.id "
+ "AND fs.name = '%s' "
+ "AND fkt.name = '%s' "
+ "ORDER BY fkk.name, fkkc.nr", schema, tname);
} else if (tid != NULL) {
maxquerylen = 1024 + strlen(tid);
query = malloc(maxquerylen);
@@ -349,15 +349,15 @@ dump_foreign_keys(Mapi mid, const char *
"sys.objects pkkc, "
"sys.keys pkk, "
"sys.schemas ps "
- "WHERE fkt.id = fkk.table_id AND "
- "pkt.id = pkk.table_id AND "
- "fkk.id = fkkc.id AND "
- "pkk.id = pkkc.id AND "
- "fkk.rkey = pkk.id AND "
- "fkkc.nr = pkkc.nr AND "
- "pkt.schema_id = ps.id AND "
- "fkt.id = %s "
- "ORDER BY fkk.name, nr", tid);
+ "WHERE fkt.id = fkk.table_id "
+ "AND pkt.id = pkk.table_id "
+ "AND fkk.id = fkkc.id "
+ "AND pkk.id = pkkc.id "
+ "AND fkk.rkey = pkk.id "
+ "AND fkkc.nr = pkkc.nr "
+ "AND pkt.schema_id = ps.id "
+ "AND fkt.id = %s "
+ "ORDER BY fkk.name, fkkc.nr", tid);
} else {
query = "SELECT ps.name, " /* 0 */
"pkt.name, " /* 1 */
@@ -376,17 +376,17 @@ dump_foreign_keys(Mapi mid, const char *
"sys.keys pkk, "
"sys.schemas ps, "
"sys.schemas fs "
- "WHERE fkt.id = fkk.table_id AND "
- "pkt.id = pkk.table_id AND "
- "fkk.id = fkkc.id AND "
- "pkk.id = pkkc.id AND "
- "fkk.rkey = pkk.id AND "
- "fkkc.nr = pkkc.nr AND "
- "pkt.schema_id = ps.id AND "
- "fkt.schema_id = fs.id AND "
- "fkt.system = FALSE "
+ "WHERE fkt.id = fkk.table_id "
+ "AND pkt.id = pkk.table_id "
+ "AND fkk.id = fkkc.id "
+ "AND pkk.id = pkkc.id "
+ "AND fkk.rkey = pkk.id "
+ "AND fkkc.nr = pkkc.nr "
+ "AND pkt.schema_id = ps.id "
+ "AND fkt.schema_id = fs.id "
+ "AND fkt.system = FALSE "
"ORDER BY fs.name, fkt.name, "
- "fkk.name, nr";
+ "fkk.name, fkkc.nr";
}
hdl = mapi_query(mid, query);
if (query != NULL && maxquerylen != 0)
@@ -682,7 +682,8 @@ dump_type(Mapi mid, stream *toConsole, c
}
static int
-dump_column_definition(Mapi mid, stream *toConsole, const char *schema, const
char *tname, const char *tid, bool foreign, bool hashge)
+dump_column_definition(Mapi mid, stream *toConsole, const char *schema,
+ const char *tname, const char *tid, bool foreign, bool
hashge)
{
MapiHdl hdl = NULL;
char *query = NULL;
@@ -728,10 +729,10 @@ dump_column_definition(Mapi mid, stream
"FROM sys._columns c, "
"sys._tables t, "
"sys.schemas s "
- "WHERE c.table_id = t.id AND "
- "'%s' = t.name AND "
- "t.schema_id = s.id AND "
- "s.name = '%s' "
+ "WHERE c.table_id = t.id "
+ "AND '%s' = t.name "
+ "AND t.schema_id = s.id "
+ "AND s.name = '%s' "
"ORDER BY c.number", tname, schema);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -781,30 +782,30 @@ dump_column_definition(Mapi mid, stream
"SELECT kc.name, " /* 0 */
"kc.nr, " /* 1 */
"k.name, " /* 2 */
- "k.id " /* 3 */
+ "kc.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k "
- "WHERE kc.id = k.id AND "
- "k.table_id = %s AND "
- "k.type = 0 "
- "ORDER BY k.id, kc.nr", tid);
+ "WHERE kc.id = k.id "
+ "AND k.table_id = %s "
+ "AND k.type = 0 "
+ "ORDER BY kc.id, kc.nr", tid);
else
snprintf(query, maxquerylen,
"SELECT kc.name, " /* 0 */
"kc.nr, " /* 1 */
"k.name, " /* 2 */
- "k.id " /* 3 */
+ "kc.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k, "
"sys.schemas s, "
"sys._tables t "
- "WHERE kc.id = k.id AND "
- "k.table_id = t.id AND "
- "k.type = 0 AND "
- "t.schema_id = s.id AND "
- "s.name = '%s' AND "
- "t.name = '%s' "
- "ORDER BY k.id, kc.nr", schema, tname);
+ "WHERE kc.id = k.id "
+ "AND k.table_id = t.id "
+ "AND k.type = 0 "
+ "AND t.schema_id = s.id "
+ "AND s.name = '%s' "
+ "AND t.name = '%s' "
+ "ORDER BY kc.id, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
cnt = 0;
@@ -840,30 +841,30 @@ dump_column_definition(Mapi mid, stream
"SELECT kc.name, " /* 0 */
"kc.nr, " /* 1 */
"k.name, " /* 2 */
- "k.id " /* 3 */
+ "kc.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k "
- "WHERE kc.id = k.id AND "
- "k.table_id = %s AND "
- "k.type = 1 "
- "ORDER BY k.id, kc.nr", tid);
+ "WHERE kc.id = k.id "
+ "AND k.table_id = %s "
+ "AND k.type = 1 "
+ "ORDER BY kc.id, kc.nr", tid);
else
snprintf(query, maxquerylen,
"SELECT kc.name, " /* 0 */
"kc.nr, " /* 1 */
"k.name, " /* 2 */
- "k.id " /* 3 */
+ "kc.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k, "
"sys.schemas s, "
"sys._tables t "
- "WHERE kc.id = k.id AND "
- "k.table_id = t.id AND "
- "k.type = 1 AND "
- "t.schema_id = s.id AND "
- "s.name = '%s' AND "
- "t.name = '%s' "
- "ORDER BY k.id, kc.nr", schema, tname);
+ "WHERE kc.id = k.id "
+ "AND k.table_id = t.id "
+ "AND k.type = 1 "
+ "AND t.schema_id = s.id "
+ "AND s.name = '%s' "
+ "AND t.name = '%s' "
+ "ORDER BY kc.id, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
cnt = 0;
@@ -923,7 +924,8 @@ dump_column_definition(Mapi mid, stream
}
int
-describe_table(Mapi mid, const char *schema, const char *tname, stream
*toConsole, int foreign, bool databaseDump)
+describe_table(Mapi mid, const char *schema, const char *tname,
+ stream *toConsole, int foreign, bool databaseDump)
{
int cnt, table_id = 0;
MapiHdl hdl = NULL;
@@ -965,10 +967,11 @@ describe_table(Mapi mid, const char *sch
snprintf(query, maxquerylen,
"%s "
"SELECT t.name, t.query, t.type, t.id, c.remark "
- "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'",
+ "FROM sys.schemas s, sys._tables t "
+ "LEFT OUTER JOIN sys.comments c ON t.id = c.id "
+ "WHERE s.name = '%s' "
+ "AND t.schema_id = s.id "
+ "AND t.name = '%s'",
comments_clause,
schema, tname);
@@ -1054,7 +1057,8 @@ describe_table(Mapi mid, const char *sch
char *rt_user = NULL;
char *rt_hash = NULL;
snprintf(query, maxquerylen,
- "SELECT username, hash FROM
sys.remote_table_credentials('%s.%s')",
+ "SELECT username, hash "
+ "FROM sys.remote_table_credentials('%s.%s')",
schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL ||
mapi_error(mid))
goto bailout;
@@ -1116,15 +1120,15 @@ describe_table(Mapi mid, const char *sch
"sys._columns AS c, "
"sys.schemas s, "
"sys._tables AS t "
- "WHERE i.table_id = t.id AND "
- "i.id = kc.id AND "
- "t.id = c.table_id AND "
- "kc.name = c.name AND "
- "(k.type IS NULL OR k.type = 1) AND "
- "t.schema_id = s.id AND "
- "s.name = '%s' AND "
- "t.name = '%s' AND "
- "i.type in (0, 4, 5) "
+ "WHERE i.table_id = t.id "
+ "AND i.id = kc.id "
+ "AND t.id = c.table_id "
+ "AND kc.name = c.name "
+ "AND (k.type IS NULL OR k.type = 1) "
+ "AND t.schema_id = s.id "
+ "AND s.name = '%s' "
+ "AND t.name = '%s' "
+ "AND i.type in (0, 4, 5) "
"ORDER BY i.name, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -1180,7 +1184,7 @@ describe_table(Mapi mid, const char *sch
snprintf(query, maxquerylen,
"%s "
"SELECT i.name, c.remark "
- "FROM sys.idxs i, comments c "
+ "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",
@@ -1200,7 +1204,7 @@ describe_table(Mapi mid, const char *sch
snprintf(query, maxquerylen,
"%s "
"SELECT col.name, com.remark "
- "FROM sys._columns col, comments com "
+ "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 col.number",
@@ -1292,11 +1296,11 @@ describe_sequence(Mapi mid, const char *
"seq.\"increment\", "
"seq.\"cycle\", "
"rem.\"remark\" "
- "FROM sys.sequences seq LEFT OUTER JOIN comments rem ON seq.id
= rem.id, "
+ "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 "
- "seq.name = '%s' "
+ "WHERE s.id = seq.schema_id "
+ "AND s.name = '%s' "
+ "AND seq.name = '%s' "
"ORDER BY s.name, seq.name",
comments_clause,
schema, tname);
@@ -1368,9 +1372,9 @@ 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 comments c ON s.id = c.id "
- "WHERE s.\"authorization\" = a.id AND "
- "s.name = '%s' "
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
