MonetDB: Oct2020 - Schema parameter is optional for monetdbe_append

[Pedro Ferreira]

Changeset: c5a742c3bbbc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5a742c3bbbc
Modified Files:
        tools/monetdbe/monetdbe.c
Branch: Oct2020
Log Message:

Schema parameter is optional for monetdbe_append


diffs (57 lines):

diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -971,14 +971,14 @@ monetdbe_get_columns(monetdbe_database d
        }
        if (schema_name) {
                if (!(s = mvc_bind_schema(m, schema_name))) {
-                       mdbe->msg = createException(MAL, 
"monetdbe.monetdbe_get_columns", "Could not find schema %s", schema_name);
+                       mdbe->msg = createException(SQL, 
"monetdbe.monetdbe_get_columns", "Could not find schema '%s'", schema_name);
                        goto cleanup;
                }
        } else {
                s = cur_schema(m);
        }
        if (!(t = mvc_bind_table(m, s, table_name))) {
-               mdbe->msg = createException(MAL, 
"monetdbe.monetdbe_get_columns", "Could not find table %s", table_name);
+               mdbe->msg = createException(SQL, 
"monetdbe.monetdbe_get_columns", "No such table '%s' in schema '%s'", 
table_name, s->base.name);
                goto cleanup;
        }
 
@@ -1075,7 +1075,6 @@ GENERATE_BASE_HEADERS(monetdbe_data_time
 char*
 monetdbe_append(monetdbe_database dbhdl, const char* schema, const char* 
table, monetdbe_column **input, size_t column_count)
 {
-
        monetdbe_database_internal *mdbe = (monetdbe_database_internal*)dbhdl;
        mvc *m = NULL;
        sql_schema *s = NULL;
@@ -1093,10 +1092,6 @@ monetdbe_append(monetdbe_database dbhdl,
        if ((mdbe->msg = SQLtrans(m)) != MAL_SUCCEED)
                goto cleanup;
 
-       if (schema == NULL) {
-               mdbe->msg = createException(MAL, "monetdbe.monetdbe_append", 
"schema parameter is NULL");
-               goto cleanup;
-       }
        if (table == NULL) {
                mdbe->msg = createException(MAL, "monetdbe.monetdbe_append", 
"table parameter is NULL");
                goto cleanup;
@@ -1112,7 +1107,7 @@ monetdbe_append(monetdbe_database dbhdl,
 
        if (schema) {
                if (!(s = mvc_bind_schema(m, schema))) {
-                       mdbe->msg = createException(MAL, 
"monetdbe.monetdbe_append", "Schema missing %s", schema);
+                       mdbe->msg = createException(SQL, 
"monetdbe.monetdbe_append", "Could not find schema '%s'", schema);
                        goto cleanup;
                }
        } else {
@@ -1120,7 +1115,7 @@ monetdbe_append(monetdbe_database dbhdl,
        }
 
        if (!(t = mvc_bind_table(m, s, table))) {
-               mdbe->msg = createException(SQL, "monetdbe.monetdbe_append", 
"Table missing %s.%s", schema, table);
+               mdbe->msg = createException(SQL, "monetdbe.monetdbe_append", 
"No such table '%s' in schema '%s'", table, s->base.name);
                goto cleanup;
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list