Changeset: 0205e1c555b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0205e1c555b3
Added Files:
sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.sql
sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.err
sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.out
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/msqldump.h
sql/server/rel_optimizer.c
sql/server/sql_parser.y
sql/test/BugTracker-2017/Tests/All
sql/test/UserDump/Tests/create.SQL.py
Branch: Jul2017
Log Message:
merged
diffs (truncated from 1523 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
@@ -235,16 +235,16 @@ dump_foreign_keys(Mapi mid, const char *
cnt = mapi_fetch_row(hdl);
while (cnt != 0) {
- char *c_psname = mapi_fetch_field(hdl, 0);
- char *c_ptname = mapi_fetch_field(hdl, 1);
- char *c_pcolumn = mapi_fetch_field(hdl, 2);
- char *c_fcolumn = mapi_fetch_field(hdl, 3);
- char *c_nr = mapi_fetch_field(hdl, 4);
- char *c_fkname = mapi_fetch_field(hdl, 5);
- char *c_faction = mapi_fetch_field(hdl, 6);
- char *c_fsname = mapi_fetch_field(hdl, 7);
- char *c_ftname = mapi_fetch_field(hdl, 8);
- char **fkeys, **pkeys;
+ const char *c_psname = mapi_fetch_field(hdl, 0);
+ const char *c_ptname = mapi_fetch_field(hdl, 1);
+ const char *c_pcolumn = mapi_fetch_field(hdl, 2);
+ const char *c_fcolumn = mapi_fetch_field(hdl, 3);
+ const char *c_nr = mapi_fetch_field(hdl, 4);
+ const char *c_fkname = mapi_fetch_field(hdl, 5);
+ const char *c_faction = mapi_fetch_field(hdl, 6);
+ const char *c_fsname = mapi_fetch_field(hdl, 7);
+ const char *c_ftname = mapi_fetch_field(hdl, 8);
+ const char **fkeys, **pkeys;
int nkeys = 0;
if (mapi_error(mid))
@@ -258,8 +258,8 @@ dump_foreign_keys(Mapi mid, const char *
fkeys[nkeys - 1] = c_fcolumn;
while ((cnt = mapi_fetch_row(hdl)) != 0 &&
strcmp(mapi_fetch_field(hdl, 4), "0") != 0) {
nkeys++;
- pkeys = realloc(pkeys, nkeys * sizeof(*pkeys));
- fkeys = realloc(fkeys, nkeys * sizeof(*fkeys));
+ pkeys = realloc((void *) pkeys, nkeys * sizeof(*pkeys));
+ fkeys = realloc((void *) fkeys, nkeys * sizeof(*fkeys));
pkeys[nkeys - 1] = mapi_fetch_field(hdl, 2);
fkeys[nkeys - 1] = mapi_fetch_field(hdl, 3);
}
@@ -286,8 +286,8 @@ dump_foreign_keys(Mapi mid, const char *
i > 0 ? ", " : "", pkeys[i]);
}
mnstr_printf(toConsole, ")");
- free(fkeys);
- free(pkeys);
+ free((void *) fkeys);
+ free((void *) pkeys);
if (c_faction) {
int action = atoi(c_faction);
int on_update;
@@ -366,7 +366,7 @@ static const char *geomsubtypes[] = {
};
static int
-dump_type(Mapi mid, stream *toConsole, char *c_type, char *c_type_digits, char
*c_type_scale, int hashge)
+dump_type(Mapi mid, stream *toConsole, const char *c_type, const char
*c_type_digits, const char *c_type_scale, int hashge)
{
int space = 0;
@@ -562,12 +562,12 @@ dump_column_definition(Mapi mid, stream
slen = mapi_get_len(hdl, 0);
cnt = 0;
while ((mapi_fetch_row(hdl)) != 0) {
- char *c_name = mapi_fetch_field(hdl, 0);
- char *c_type = mapi_fetch_field(hdl, 1);
- char *c_type_digits = mapi_fetch_field(hdl, 2);
- char *c_type_scale = mapi_fetch_field(hdl, 3);
- char *c_null = mapi_fetch_field(hdl, 4);
- char *c_default = mapi_fetch_field(hdl, 5);
+ const char *c_name = mapi_fetch_field(hdl, 0);
+ const char *c_type = mapi_fetch_field(hdl, 1);
+ const char *c_type_digits = mapi_fetch_field(hdl, 2);
+ const char *c_type_scale = mapi_fetch_field(hdl, 3);
+ const char *c_null = mapi_fetch_field(hdl, 4);
+ const char *c_default = mapi_fetch_field(hdl, 5);
int space;
if (mapi_error(mid))
@@ -631,8 +631,8 @@ dump_column_definition(Mapi mid, stream
goto bailout;
cnt = 0;
while ((mapi_fetch_row(hdl)) != 0) {
- char *c_column = mapi_fetch_field(hdl, 0);
- char *k_name = mapi_fetch_field(hdl, 2);
+ const char *c_column = mapi_fetch_field(hdl, 0);
+ const char *k_name = mapi_fetch_field(hdl, 2);
if (mapi_error(mid))
goto bailout;
@@ -690,9 +690,9 @@ dump_column_definition(Mapi mid, stream
goto bailout;
cnt = 0;
while ((mapi_fetch_row(hdl)) != 0) {
- char *c_column = mapi_fetch_field(hdl, 0);
- char *kc_nr = mapi_fetch_field(hdl, 1);
- char *k_name = mapi_fetch_field(hdl, 2);
+ const char *c_column = mapi_fetch_field(hdl, 0);
+ const char *kc_nr = mapi_fetch_field(hdl, 1);
+ const char *k_name = mapi_fetch_field(hdl, 2);
if (mapi_error(mid))
goto bailout;
@@ -745,7 +745,7 @@ dump_column_definition(Mapi mid, stream
}
int
-describe_table(Mapi mid, char *schema, 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;
@@ -854,10 +854,10 @@ describe_table(Mapi mid, char *schema, c
goto bailout;
cnt = 0;
while (mapi_fetch_row(hdl) != 0) {
- char *i_name = mapi_fetch_field(hdl, 0);
- char *k_name = mapi_fetch_field(hdl, 1);
- char *kc_nr = mapi_fetch_field(hdl, 2);
- char *c_name = mapi_fetch_field(hdl, 3);
+ const char *i_name = mapi_fetch_field(hdl, 0);
+ const char *k_name = mapi_fetch_field(hdl, 1);
+ const char *kc_nr = mapi_fetch_field(hdl, 2);
+ const char *c_name = mapi_fetch_field(hdl, 3);
if (mapi_error(mid))
goto bailout;
@@ -914,7 +914,7 @@ describe_table(Mapi mid, char *schema, c
}
int
-describe_sequence(Mapi mid, char *schema, char *tname, stream *toConsole)
+describe_sequence(Mapi mid, const char *schema, const char *tname, stream
*toConsole)
{
MapiHdl hdl = NULL;
char *query;
@@ -958,13 +958,13 @@ describe_sequence(Mapi mid, char *schema
goto bailout;
while (mapi_fetch_row(hdl) != 0) {
- char *schema = mapi_fetch_field(hdl, 0);
- char *name = mapi_fetch_field(hdl, 1);
- char *start = mapi_fetch_field(hdl, 2);
- char *minvalue = mapi_fetch_field(hdl, 3);
- char *maxvalue = mapi_fetch_field(hdl, 4);
- char *increment = mapi_fetch_field(hdl, 5);
- char *cycle = mapi_fetch_field(hdl, 6);
+ const char *schema = mapi_fetch_field(hdl, 0);
+ const char *name = mapi_fetch_field(hdl, 1);
+ const char *start = mapi_fetch_field(hdl, 2);
+ const char *minvalue = mapi_fetch_field(hdl, 3);
+ const char *maxvalue = mapi_fetch_field(hdl, 4);
+ const char *increment = mapi_fetch_field(hdl, 5);
+ const char *cycle = mapi_fetch_field(hdl, 6);
mnstr_printf(toConsole,
"CREATE SEQUENCE \"%s\".\"%s\" START WITH %s",
@@ -1009,7 +1009,7 @@ bailout:
}
int
-describe_schema(Mapi mid, char *sname, stream *toConsole)
+describe_schema(Mapi mid, const char *sname, stream *toConsole)
{
MapiHdl hdl = NULL;
char schemas[256];
@@ -1037,8 +1037,8 @@ describe_schema(Mapi mid, char *sname, s
}
while (mapi_fetch_row(hdl) != 0) {
- char *sname = mapi_fetch_field(hdl, 0);
- char *aname = mapi_fetch_field(hdl, 1);
+ const char *sname = mapi_fetch_field(hdl, 0);
+ const char *aname = mapi_fetch_field(hdl, 1);
mnstr_printf(toConsole, "CREATE SCHEMA \"%s\"", sname);
if (strcmp(aname, "sysadmin") != 0) {
@@ -1052,7 +1052,7 @@ describe_schema(Mapi mid, char *sname, s
}
static int
-dump_table_data(Mapi mid, char *schema, char *tname, stream *toConsole,
+dump_table_data(Mapi mid, const char *schema, const char *tname, stream
*toConsole,
const char useInserts)
{
int cnt, i;
@@ -1113,7 +1113,7 @@ dump_table_data(Mapi mid, char *schema,
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
if (mapi_fetch_row(hdl)) {
- char *cntfld = mapi_fetch_field(hdl, 0);
+ const char *cntfld = mapi_fetch_field(hdl, 0);
if (strcmp(cntfld, "0") == 0) {
/* no records to dump, so return early */
@@ -1210,7 +1210,7 @@ dump_table_data(Mapi mid, char *schema,
}
int
-dump_table(Mapi mid, char *schema, char *tname, stream *toConsole, int
describe, int foreign, const char useInserts)
+dump_table(Mapi mid, const char *schema, const char *tname, stream *toConsole,
int describe, int foreign, const char useInserts)
{
int rc;
@@ -1220,72 +1220,210 @@ dump_table(Mapi mid, char *schema, char
return rc;
}
+static int
+dump_function(Mapi mid, stream *toConsole, const char *sname, const char
*fname, int hashge)
+{
+ MapiHdl hdl;
+ size_t qlen = 200 + strlen(sname) + strlen(fname);
+ char *query = malloc(qlen);
+ const char *sep;
+ char *fid, *ffunc;
+ int flang, ftype;
+
+ snprintf(query, qlen, "select f.id, f.func, f.language, f.type from
sys.functions f, sys.schemas s where f.schema_id = s.id and s.name = '%s' and
f.name = '%s'", sname, fname);
+ hdl = mapi_query(mid, query);
+ if (mapi_fetch_row(hdl) == 0) {
+ free(query);
+ mapi_close_handle(hdl);
+ return 0; /* no such function, apparently */
+ }
+ fid = mapi_fetch_field(hdl, 0);
+ ffunc = mapi_fetch_field(hdl, 1);
+ flang = atoi(mapi_fetch_field(hdl, 2));
+ ftype = atoi(mapi_fetch_field(hdl, 3));
+ if (flang == 1 || flang == 2) {
+ /* all information is stored in the func column */
+ mnstr_printf(toConsole, "%s\n", ffunc);
+ mapi_close_handle(hdl);
+ free(query);
+ return 0;
+ }
+ mnstr_printf(toConsole, "CREATE ");
+ switch (ftype) {
+ case 1: /* scalar function */
+ case 5: /* table returning function */
+ mnstr_printf(toConsole, "FUNCTION");
+ break;
+ case 2:
+ mnstr_printf(toConsole, "PROCEDURE");
+ break;
+ case 3:
+ mnstr_printf(toConsole, "AGGREGATE");
+ break;
+ case 4:
+ mnstr_printf(toConsole, "FILTER FUNCTION");
+ break;
+ case 7:
+ mnstr_printf(toConsole, "LOADER");
+ break;
+ default:
+ /* shouldn't happen (6 is F_ANALYTIC, but no syntax to
+ * create, or values are not defined) */
+ free(query);
+ mapi_close_handle(hdl);
+ return -1;
+ }
+ ffunc = strdup(ffunc);
+ mnstr_printf(toConsole, " ");
+ quoted_print(toConsole, sname, 0);
+ mnstr_printf(toConsole, ".");
+ quoted_print(toConsole, fname, 0);
+ mnstr_printf(toConsole, "(");
+ snprintf(query, qlen, "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);
+ mapi_close_handle(hdl);
+ hdl = mapi_query(mid, query);
+ free(query);
+ sep = "";
+ while (mapi_fetch_row(hdl) != 0) {
+ const char *aname = mapi_fetch_field(hdl, 0);
+ const char *atype = mapi_fetch_field(hdl, 1);
+ const char *adigs = mapi_fetch_field(hdl, 2);
+ const char *ascal = mapi_fetch_field(hdl, 3);
+ const char *ainou = mapi_fetch_field(hdl, 4);
+
+ if (strcmp(ainou, "0") == 0) {
+ /* end of arguments */
+ break;
+ }
+
+ mnstr_printf(toConsole, "%s", sep);
+ quoted_print(toConsole, aname, 0);
+ mnstr_printf(toConsole, " ");
+ dump_type(mid, toConsole, atype, adigs, ascal, hashge);
+ sep = ", ";
+ }
+ mnstr_printf(toConsole, ")");
+ if (ftype == 1 || ftype == 3 || ftype == 5) {
+ sep = "TABLE (";
+ mnstr_printf(toConsole, " RETURNS ");
+ do {
+ const char *aname = mapi_fetch_field(hdl, 0);
+ const char *atype = mapi_fetch_field(hdl, 1);
+ const char *adigs = mapi_fetch_field(hdl, 2);
+ const char *ascal = mapi_fetch_field(hdl, 3);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
