Changeset: a6f5eda2607b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a6f5eda2607b
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql.c
Branch: userprofile
Log Message:
Merge with default branch.
diffs (truncated from 2585 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1768,10 +1768,6 @@ int sql_trans_create_table(sql_table **t
# stream
stream *block_stream(stream *s);
-stream *block_stream2(stream *s, size_t bufsiz, compression_method comp);
-buffer bs2_buffer(stream *s);
-int bs2_resizebuf(stream *ss, size_t bufsiz);
-void bs2_setpos(stream *ss, size_t pos);
stream *bs_stream(stream *s);
bstream *bstream_create(stream *rs, size_t chunk_size);
void bstream_destroy(bstream *s);
@@ -1798,6 +1794,7 @@ stream *iconv_rstream(stream *restrict s
stream *iconv_wstream(stream *restrict ss, const char *restrict charset, const
char *restrict name);
bool isa_block_stream(const stream *s);
stream *lz4_stream(stream *inner, int preset);
+stream *mapi_request_upload(const char *filename, bool binary, bstream *rs,
stream *ws);
void mnstr_clearerr(stream *s);
void mnstr_close(stream *s);
void mnstr_destroy(stream *s);
@@ -1855,7 +1852,6 @@ stream *open_rstream(const char *filenam
stream *open_urlstream(const char *url);
stream *open_wastream(const char *filename);
stream *open_wstream(const char *filename);
-void set_prompting(stream *block_stream, const char *prompt, stream
*prompt_stream);
stream *socket_rstream(SOCKET socket, const char *name);
stream *socket_wstream(SOCKET socket, const char *name);
stream *stderr_wastream(void);
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library(mapi
target_sources(mapi
PRIVATE
mapi.c
- mapi_prompt.h
PUBLIC
$<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/mapi.h>
$<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/mapi_querytype.h>
diff --git a/clients/odbc/driver/SQLColumnPrivileges.c
b/clients/odbc/driver/SQLColumnPrivileges.c
--- a/clients/odbc/driver/SQLColumnPrivileges.c
+++ b/clients/odbc/driver/SQLColumnPrivileges.c
@@ -110,7 +110,7 @@ MNDBColumnPrivileges(ODBCStmt *stmt,
}
/* construct the query now */
- querylen = 1300 + strlen(stmt->Dbc->dbname) + (sch ? strlen(sch) : 0) +
+ querylen = 1300 + (sch ? strlen(sch) : 0) +
(tab ? strlen(tab) : 0) + (col ? strlen(col) : 0);
query = malloc(querylen);
if (query == NULL)
@@ -128,7 +128,7 @@ MNDBColumnPrivileges(ODBCStmt *stmt,
*/
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"TABLE_CAT\", "
+ "select cast(null as varchar(1)) as \"TABLE_CAT\", "
"s.name as \"TABLE_SCHEM\", "
"tc.tname as \"TABLE_NAME\", "
"tc.cname as \"COLUMN_NAME\", "
@@ -166,7 +166,6 @@ MNDBColumnPrivileges(ODBCStmt *stmt,
"tc.schema_id = s.id and "
"p.grantor = g.id and "
"p.privileges = pc.privilege_code_id",
- stmt->Dbc->dbname,
/* a server that supports sys.comments also supports
* sys.privilege_codes */
stmt->Dbc->has_comment ? "sys.privilege_codes as pc" :
diff --git a/clients/odbc/driver/SQLColumns.c b/clients/odbc/driver/SQLColumns.c
--- a/clients/odbc/driver/SQLColumns.c
+++ b/clients/odbc/driver/SQLColumns.c
@@ -122,7 +122,7 @@ MNDBColumns(ODBCStmt *stmt,
}
/* construct the query now */
- querylen = 6500 + strlen(stmt->Dbc->dbname) + (sch ? strlen(sch) : 0) +
+ querylen = 6500 + (sch ? strlen(sch) : 0) +
(tab ? strlen(tab) : 0) + (col ? strlen(col) : 0);
query = malloc(querylen);
if (query == NULL)
@@ -150,7 +150,7 @@ MNDBColumns(ODBCStmt *stmt,
*/
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"TABLE_CAT\", "
+ "select cast(null as varchar(1)) as \"TABLE_CAT\", "
"s.name as \"TABLE_SCHEM\", "
"t.name as \"TABLE_NAME\", "
"c.name as \"COLUMN_NAME\", "
@@ -179,7 +179,6 @@ MNDBColumns(ODBCStmt *stmt,
"sys.columns c%s "
"where s.id = t.schema_id and "
"t.id = c.table_id",
- stmt->Dbc->dbname,
#ifdef DATA_TYPE_ARGS
DATA_TYPE_ARGS,
#endif
diff --git a/clients/odbc/driver/SQLExecute.c b/clients/odbc/driver/SQLExecute.c
--- a/clients/odbc/driver/SQLExecute.c
+++ b/clients/odbc/driver/SQLExecute.c
@@ -362,14 +362,7 @@ ODBCInitResult(ODBCStmt *stmt)
rec->sql_desc_length = mapi_get_len(hdl, i);
rec->sql_desc_local_type_name = NULL;
- if (rec->sql_desc_catalog_name == NULL) {
- if (stmt->Dbc->dbname) {
- rec->sql_desc_catalog_name = (SQLCHAR *)
strdup(stmt->Dbc->dbname);
- if (rec->sql_desc_catalog_name == NULL)
- goto nomem;
- } else
- rec->sql_desc_catalog_name = NULL;
- }
+ rec->sql_desc_catalog_name = NULL;
rec->sql_desc_literal_prefix = NULL;
rec->sql_desc_literal_suffix = NULL;
diff --git a/clients/odbc/driver/SQLForeignKeys.c
b/clients/odbc/driver/SQLForeignKeys.c
--- a/clients/odbc/driver/SQLForeignKeys.c
+++ b/clients/odbc/driver/SQLForeignKeys.c
@@ -141,7 +141,7 @@ MNDBForeignKeys(ODBCStmt *stmt,
/* first create a string buffer (1300 extra bytes is plenty:
we actually need just over 1100) */
- querylen = 1300 + (2 * strlen(stmt->Dbc->dbname)) +
+ querylen = 1300 +
(psch ? strlen(psch) : 0) + (ptab ? strlen(ptab) : 0) +
(fsch ? strlen(fsch) : 0) + (ftab ? strlen(ftab) : 0);
query = malloc(querylen);
@@ -166,11 +166,11 @@ MNDBForeignKeys(ODBCStmt *stmt,
*/
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"PKTABLE_CAT\", "
+ "select cast(null as varchar(1)) as \"PKTABLE_CAT\", "
"pks.name as \"PKTABLE_SCHEM\", "
"pkt.name as \"PKTABLE_NAME\", "
"pkkc.name as \"PKCOLUMN_NAME\", "
- "'%s' as \"FKTABLE_CAT\", "
+ "cast(null as varchar(1)) as \"FKTABLE_CAT\", "
"fks.name as \"FKTABLE_SCHEM\", "
"fkt.name as \"FKTABLE_NAME\", "
"fkkc.name as \"FKCOLUMN_NAME\", "
@@ -199,8 +199,6 @@ MNDBForeignKeys(ODBCStmt *stmt,
"pkt.id = pkk.table_id and "
"fks.id = fkt.schema_id and "
"pks.id = pkt.schema_id",
- stmt->Dbc->dbname,
- stmt->Dbc->dbname,
SQL_NO_ACTION, SQL_CASCADE, SQL_RESTRICT, SQL_SET_NULL,
SQL_SET_DEFAULT, SQL_NO_ACTION,
SQL_NO_ACTION, SQL_CASCADE, SQL_RESTRICT, SQL_SET_NULL,
SQL_SET_DEFAULT, SQL_NO_ACTION,
SQL_NOT_DEFERRABLE);
diff --git a/clients/odbc/driver/SQLPrepare.c b/clients/odbc/driver/SQLPrepare.c
--- a/clients/odbc/driver/SQLPrepare.c
+++ b/clients/odbc/driver/SQLPrepare.c
@@ -277,7 +277,6 @@ MNDBPrepare(ODBCStmt *stmt,
rec->sql_desc_local_type_name = NULL;
rec->sql_desc_rowver = SQL_FALSE;
- rec->sql_desc_catalog_name = stmt->Dbc->dbname ? (SQLCHAR *)
strdup(stmt->Dbc->dbname) : NULL;
/* unused fields */
rec->sql_desc_auto_unique_value = SQL_FALSE;
@@ -287,6 +286,7 @@ MNDBPrepare(ODBCStmt *stmt,
rec->sql_desc_literal_prefix = NULL;
rec->sql_desc_literal_suffix = NULL;
rec->sql_desc_octet_length_ptr = NULL;
+ rec->sql_desc_catalog_name = NULL;
rec->sql_desc_schema_name = NULL;
rec->sql_desc_updatable = SQL_ATTR_READONLY;
diff --git a/clients/odbc/driver/SQLPrimaryKeys.c
b/clients/odbc/driver/SQLPrimaryKeys.c
--- a/clients/odbc/driver/SQLPrimaryKeys.c
+++ b/clients/odbc/driver/SQLPrimaryKeys.c
@@ -114,8 +114,7 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
|| strchr((const char *) SchemaName, '_') != NULL));
/* construct the query */
- querylen = 1000 + strlen(stmt->Dbc->dbname) +
- (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0);
+ querylen = 1000 + (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0);
if (addTmpQuery)
querylen *= 2;
query = malloc(querylen);
@@ -131,7 +130,7 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
VARCHAR PK_NAME
*/
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"TABLE_CAT\", "
+ "select cast(null as varchar(1)) as \"TABLE_CAT\", "
"s.name as \"TABLE_SCHEM\", "
"t.name as \"TABLE_NAME\", "
"kc.name as \"COLUMN_NAME\", "
@@ -141,8 +140,7 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
"where k.type = 0 and "
"k.id = kc.id and "
"k.table_id = t.id and "
- "t.schema_id = s.id",
- stmt->Dbc->dbname);
+ "t.schema_id = s.id");
assert(pos < 800);
/* Construct the selection condition query part */
@@ -167,7 +165,7 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
which are stored in tmp.keys, tmp.objects and tmp._tables */
pos += snprintf(query + pos, querylen - pos,
" UNION ALL "
- "select '%s' as \"TABLE_CAT\", "
+ "select cast(null as varchar(1)) as \"TABLE_CAT\", "
"s.name as \"TABLE_SCHEM\", "
"t.name as \"TABLE_NAME\", "
"kc.name as \"COLUMN_NAME\", "
@@ -177,8 +175,7 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
"where k.type = 0 and "
"k.id = kc.id and "
"k.table_id = t.id and "
- "t.schema_id = s.id",
- stmt->Dbc->dbname);
+ "t.schema_id = s.id");
/* Construct the selection condition query part */
if (NameLength1 > 0 && CatalogName != NULL) {
@@ -197,7 +194,6 @@ MNDBPrimaryKeys(ODBCStmt *stmt,
pos += snprintf(query + pos, querylen - pos, " and %s",
tab);
}
}
- assert(pos < (querylen - 43));
if (sch)
free(sch);
diff --git a/clients/odbc/driver/SQLProcedureColumns.c
b/clients/odbc/driver/SQLProcedureColumns.c
--- a/clients/odbc/driver/SQLProcedureColumns.c
+++ b/clients/odbc/driver/SQLProcedureColumns.c
@@ -114,8 +114,7 @@ MNDBProcedureColumns(ODBCStmt *stmt,
}
/* construct the query now */
- querylen = 6500 + strlen(stmt->Dbc->dbname) +
- (sch ? strlen(sch) : 0) + (prc ? strlen(prc) : 0) +
+ querylen = 6500 + (sch ? strlen(sch) : 0) + (prc ? strlen(prc) : 0) +
(col ? strlen(col) : 0);
query = malloc(querylen);
if (query == NULL)
@@ -150,7 +149,7 @@ MNDBProcedureColumns(ODBCStmt *stmt,
#define F_PROC 2
#define F_UNION 5
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"PROCEDURE_CAT\", "
+ "select cast(null as varchar(1)) as \"PROCEDURE_CAT\", "
"s.name as \"PROCEDURE_SCHEM\", "
"p.name as \"PROCEDURE_NAME\", "
"a.name as \"COLUMN_NAME\", "
@@ -187,7 +186,6 @@ MNDBProcedureColumns(ODBCStmt *stmt,
"where s.id = p.schema_id and "
"p.id = a.func_id and "
"p.type in (%d, %d, %d)",
- stmt->Dbc->dbname,
/* column_type: */
SQL_PARAM_INPUT, F_UNION, SQL_RESULT_COL, SQL_RETURN_VALUE,
#ifdef DATA_TYPE_ARGS
diff --git a/clients/odbc/driver/SQLProcedures.c
b/clients/odbc/driver/SQLProcedures.c
--- a/clients/odbc/driver/SQLProcedures.c
+++ b/clients/odbc/driver/SQLProcedures.c
@@ -107,8 +107,7 @@ MNDBProcedures(ODBCStmt *stmt,
}
}
- querylen = 1000 + strlen(stmt->Dbc->dbname) +
- (sch ? strlen(sch) : 0) + (pro ? strlen(pro) : 0);
+ querylen = 1000 + (sch ? strlen(sch) : 0) + (pro ? strlen(pro) : 0);
query = malloc(querylen);
if (query == NULL)
goto nomem;
@@ -118,7 +117,7 @@ MNDBProcedures(ODBCStmt *stmt,
#define F_PROC 2
#define F_UNION 5
pos += snprintf(query + pos, querylen - pos,
- "select '%s' as \"PROCEDURE_CAT\", "
+ "select cast(null as varchar(1)) as \"PROCEDURE_CAT\", "
"s.name as \"PROCEDURE_SCHEM\", "
"p.name as \"PROCEDURE_NAME\", "
"0 as \"NUM_INPUT_PARAMS\", "
@@ -134,7 +133,6 @@ MNDBProcedures(ODBCStmt *stmt,
"sys.functions as p%s "
"where p.schema_id = s.id and "
"p.type in (%d, %d, %d)",
- stmt->Dbc->dbname,
stmt->Dbc->has_comment ? "c.remark" : "cast(null as
varchar(1))",
F_PROC, SQL_PT_PROCEDURE, SQL_PT_FUNCTION,
/* from clause: */
diff --git a/clients/odbc/driver/SQLSpecialColumns.c
b/clients/odbc/driver/SQLSpecialColumns.c
--- a/clients/odbc/driver/SQLSpecialColumns.c
+++ b/clients/odbc/driver/SQLSpecialColumns.c
@@ -205,8 +205,7 @@ MNDBSpecialColumns(ODBCStmt *stmt,
}
/* construct the query */
- querylen = 5000 + strlen(stmt->Dbc->dbname) +
- (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
