Changeset: 7f7cda7dbec8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7f7cda7dbec8
Modified Files:
clients/mapiclient/dump.c
Branch: default
Log Message:
Removed now useless outer join.
diffs (138 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2227,7 +2227,7 @@ dump_function(Mapi mid, stream *sqlf, co
int query_len;
char *query;
const char *sep;
- char *ffunc = NULL, *flkey = NULL, *remark = NULL;
+ char *ffunc = NULL, *remark = NULL;
char *sname, *fname, *ftkey;
int flang, ftype;
@@ -2243,12 +2243,10 @@ dump_function(Mapi mid, stream *sqlf, co
"s.name, "
"f.name, "
"ft.function_type_keyword, "
- "fl.language_keyword, "
"c.remark "
"FROM sys.functions f "
"JOIN sys.schemas s ON f.schema_id = s.id "
"JOIN sys.function_types ft ON f.type =
ft.function_type_id "
- "LEFT OUTER JOIN sys.function_languages fl ON
f.language = fl.language_id "
"LEFT OUTER JOIN sys.comments c ON f.id = c.id "
"WHERE f.id = %s",
fid);
@@ -2270,8 +2268,7 @@ dump_function(Mapi mid, stream *sqlf, co
sname = mapi_fetch_field(hdl, 4);
fname = mapi_fetch_field(hdl, 5);
ftkey = mapi_fetch_field(hdl, 6);
- flkey = mapi_fetch_field(hdl, 7);
- remark = mapi_fetch_field(hdl, 8);
+ remark = mapi_fetch_field(hdl, 7);
if (remark) {
remark = strdup(remark);
sname = strdup(sname);
@@ -2313,18 +2310,6 @@ dump_function(Mapi mid, stream *sqlf, co
dquoted_print(sqlf, sname, ".");
dquoted_print(sqlf, fname, "(");
}
- /* strdup these two because they are needed after another query */
- if (flkey) {
- if ((flkey = strdup(flkey)) == NULL) {
- if (remark) {
- free(remark);
- free(sname);
- free(fname);
- free(ftkey);
- }
- goto bailout;
- }
- }
ffunc = strdup(ffunc);
query_len = snprintf(query, query_size,
"SELECT a.name, a.type, a.type_digits, "
@@ -2335,7 +2320,6 @@ dump_function(Mapi mid, stream *sqlf, co
assert(query_len < (int) query_size);
if (!ffunc || query_len < 0 || query_len >= (int) query_size) {
free(ffunc);
- free(flkey);
if (remark) {
free(remark);
free(sname);
@@ -2350,7 +2334,6 @@ dump_function(Mapi mid, stream *sqlf, co
free(query);
if (hdl == NULL || mapi_error(mid)) {
free(ffunc);
- free(flkey);
if (remark) {
free(remark);
free(sname);
@@ -2381,7 +2364,6 @@ dump_function(Mapi mid, stream *sqlf, co
free(adigs);
free(ascal);
free(ffunc);
- free(flkey);
if (remark) {
free(remark);
free(sname);
@@ -2415,7 +2397,6 @@ dump_function(Mapi mid, stream *sqlf, co
free(adigs);
free(ascal);
free(ffunc);
- free(flkey);
if (remark) {
free(remark);
free(sname);
@@ -2440,31 +2421,26 @@ dump_function(Mapi mid, stream *sqlf, co
if (ftype == 5)
mnstr_printf(sqlf, ")");
}
- if (flkey) {
- mnstr_printf(sqlf, " LANGUAGE %s", flkey);
- free(flkey);
- } else {
- /* backward compatibility: dump language types for
removed
- * implementations */
- switch (flang) {
- case 3:
- mnstr_printf(sqlf, " LANGUAGE R");
- break;
- case 4:
- mnstr_printf(sqlf, " LANGUAGE C");
- break;
- case 12:
- mnstr_printf(sqlf, " LANGUAGE CPP");
- break;
- case 6:
- mnstr_printf(sqlf, " LANGUAGE PYTHON");
- break;
- case 10:
- mnstr_printf(sqlf, " LANGUAGE PYTHON3");
- break;
- default:
- break;
- }
+ /* backward compatibility: dump language types for removed
+ * implementations */
+ switch (flang) {
+ case 3:
+ mnstr_printf(sqlf, " LANGUAGE R");
+ break;
+ case 4:
+ mnstr_printf(sqlf, " LANGUAGE C");
+ break;
+ case 12:
+ mnstr_printf(sqlf, " LANGUAGE CPP");
+ break;
+ case 6:
+ mnstr_printf(sqlf, " LANGUAGE PYTHON");
+ break;
+ case 10:
+ mnstr_printf(sqlf, " LANGUAGE PYTHON3");
+ break;
+ default:
+ break;
}
mnstr_printf(sqlf, "\n%s\n", ffunc);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
