Changeset: 2f66e1b01651 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2f66e1b01651
Modified Files:
sql/backends/monet5/vaults/csv/csv.c
Branch: Aug2024
Log Message:
return sql allocator (or const) strings
diffs (43 lines):
diff --git a/sql/backends/monet5/vaults/csv/csv.c
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -452,12 +452,12 @@ csv_relation(mvc *sql, sql_subfunc *f, c
list_append(res_exps, ne);
} else {
GDKfree(types);
- throw(SQL, SQLSTATE(42000), "csv" "type %s not
found\n", st);
+ return sa_message(sql->sa, "csv" "type %s not
found\n", st);
}
} else {
/* shouldn't be possible, we fallback to strings */
GDKfree(types);
- throw(SQL, SQLSTATE(42000), "csv" "type unknown\n");
+ return sa_message(sql->sa, "csv" "type unknown\n");
}
}
GDKfree(types);
@@ -472,7 +472,7 @@ csv_relation(mvc *sql, sql_subfunc *f, c
r->extra_tsep = extra_tsep;
r->has_header = has_header;
f->sname = (char*)r; /* pass schema++ */
- return MAL_SUCCEED;
+ return NULL;
}
static void *
@@ -484,7 +484,6 @@ csv_load(void *BE, sql_subfunc *f, char
sql_table *t = NULL;
if (mvc_create_table( &t, be->mvc, be->mvc->session->tr->tmp/* misuse
tmp schema */, f->tname /*gettable name*/, tt_table, false, SQL_DECLARED_TABLE,
0, 0, false) != LOG_OK)
- //throw(SQL, SQLSTATE(42000), "csv" RUNTIME_FILE_NOT_FOUND);
/* alloc error */
return NULL;
@@ -495,7 +494,6 @@ csv_load(void *BE, sql_subfunc *f, char
sql_column *c = NULL;
if (!tp || mvc_create_column(&c, be->mvc, t, name, tp) !=
LOG_OK) {
- //throw(SQL, SQLSTATE(42000), "csv" RUNTIME_LOAD_ERROR);
return NULL;
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
