Changeset: fc2d58f44558 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc2d58f44558
Modified Files:
clients/mapiclient/dump.c
Branch: Aug2018
Log Message:
Layout.
diffs (truncated from 439 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
@@ -269,16 +269,16 @@ 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' "
+ "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);
} else if (tid != NULL) {
maxquerylen = 1024 + strlen(tid);
@@ -302,14 +302,14 @@ 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 "
+ "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);
} else {
query = "SELECT ps.name, " /* 0 */
@@ -329,15 +329,15 @@ 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";
}
@@ -635,7 +635,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;
@@ -679,10 +680,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 number", tname, schema);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -735,9 +736,9 @@ dump_column_definition(Mapi mid, stream
"k.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k "
- "WHERE kc.id = k.id AND "
- "k.table_id = %s AND "
- "k.type = 0 "
+ "WHERE kc.id = k.id "
+ "AND k.table_id = %s "
+ "AND k.type = 0 "
"ORDER BY id, nr", tid);
else
snprintf(query, maxquerylen,
@@ -749,12 +750,12 @@ dump_column_definition(Mapi mid, stream
"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' "
+ "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 id, nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -794,9 +795,9 @@ dump_column_definition(Mapi mid, stream
"k.id " /* 3 */
"FROM sys.objects kc, "
"sys.keys k "
- "WHERE kc.id = k.id AND "
- "k.table_id = %s AND "
- "k.type = 1 "
+ "WHERE kc.id = k.id "
+ "AND k.table_id = %s "
+ "AND k.type = 1 "
"ORDER BY id, nr", tid);
else
snprintf(query, maxquerylen,
@@ -808,12 +809,12 @@ dump_column_definition(Mapi mid, stream
"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' "
+ "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 id, nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -874,7 +875,8 @@ dump_column_definition(Mapi mid, stream
}
int
-describe_table(Mapi mid, const char *schema, const char *tname, stream
*toConsole, int foreign)
+describe_table(Mapi mid, const char *schema, const char *tname,
+ stream *toConsole, int foreign)
{
int cnt;
MapiHdl hdl = NULL;
@@ -912,10 +914,11 @@ 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 "
- "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);
@@ -980,7 +983,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;
@@ -1008,15 +1012,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;
@@ -1181,9 +1185,9 @@ describe_sequence(Mapi mid, const char *
"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 "
- "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);
@@ -1259,8 +1263,8 @@ describe_schema(Mapi mid, const char *sn
"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 "
- "WHERE s.\"authorization\" = a.id AND "
- "s.name = '%s' "
+ "WHERE s.\"authorization\" = a.id "
+ "AND s.name = '%s' "
"ORDER BY s.name",
comments_clause,
sname);
@@ -1331,9 +1335,9 @@ dump_table_data(Mapi mid, const char *sc
snprintf(query, maxquerylen,
"SELECT t.name, t.query, t.type "
"FROM sys._tables t, sys.schemas s "
- "WHERE s.name = '%s' AND "
- "t.schema_id = s.id AND "
- "t.name = '%s'",
+ "WHERE s.name = '%s' "
+ "AND t.schema_id = s.id "
+ "AND t.name = '%s'",
schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
@@ -1485,7 +1489,8 @@ dump_table_data(Mapi mid, const char *sc
}
int
-dump_table(Mapi mid, const char *schema, const char *tname, stream *toConsole,
int describe, int foreign, bool useInserts)
+dump_table(Mapi mid, const char *schema, const char *tname, stream *toConsole,
+ int describe, int foreign, bool useInserts)
{
int rc;
@@ -1585,7 +1590,12 @@ dump_function(Mapi mid, stream *toConsol
ffunc = strdup(ffunc);
if (flkey)
flkey = strdup(flkey);
- query_len = snprintf(query, query_size, "SELECT a.name, a.type,
a.type_digits, a.type_scale, a.inout FROM sys.args a, sys.functions f WHERE
a.func_id = f.id AND f.id = %s ORDER BY a.inout DESC, a.number", fid);
+ query_len = snprintf(query, query_size,
+ "SELECT a.name, a.type, a.type_digits, "
+ "a.type_scale, a.inout "
+ "FROM sys.args a, sys.functions f "
+ "WHERE a.func_id = f.id AND f.id = %s "
+ "ORDER BY a.inout DESC, a.number", fid);
assert(query_len < (int) query_size);
if (query_len < 0 || query_len >= (int) query_size) {
free(ffunc);
@@ -1817,15 +1827,14 @@ dump_database(Mapi mid, stream *toConsol
"s.name "
"FROM sys.db_user_info ui, "
"sys.schemas s "
- "WHERE ui.default_schema = s.id AND "
- "ui.name <> 'monetdb' "
+ "WHERE ui.default_schema = s.id "
+ "AND ui.name <> 'monetdb' "
"ORDER BY ui.name";
const char *roles =
"SELECT name "
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
