Changeset: b65748a593cc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b65748a593cc
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/vaults/monetdb/monetdb.c
Branch: odbc_loader
Log Message:
Comments
diffs (42 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -375,6 +375,7 @@ static int
goto cleanup;
}
const char *uri = mapiuri_uri(rt->query, m->sa);
+ // fprintf(stderr, "\n::\n\trt->query=%s\n\turi=%s\n\ttu->uri=%s\n",
rt->query, uri, tu->uri);
assert(strcmp(tu->uri, uri) == 0);
if (!rt) {
sql_error(m, 10, SQLSTATE(HY013) MAL_MALLOC_FAIL);
diff --git a/sql/backends/monet5/vaults/monetdb/monetdb.c
b/sql/backends/monet5/vaults/monetdb/monetdb.c
--- a/sql/backends/monet5/vaults/monetdb/monetdb.c
+++ b/sql/backends/monet5/vaults/monetdb/monetdb.c
@@ -32,13 +32,6 @@
#include "rel_basetable.h"
#include <unistd.h>
-/* Return the concatenation of the arguments,
- * with quotes doubled ONLY IN THE ODD positions.
- * The list of arguments is terminated with a NULL.
- *
- * For example, { "SELECT R'", "it's", "' AS bla", NULL }
- * becomes "SELECT R'it''s' AS bla"
- */
static char *sql_template(allocator *sa, const char **parts);
typedef struct mdb_loader_t {
@@ -178,6 +171,13 @@ end:
return ret;
}
+/* Return the concatenation of the arguments, with quotes doubled
+ * ONLY IN THE ODD positions.
+ * The list of arguments must be terminated with a NULL.
+ *
+ * For example, { "SELECT R'", "it's", "' AS bla", NULL }
+ * becomes "SELECT R'it''s' AS bla"
+ */
static char *
sql_template(allocator *sa, const char **parts)
{
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
