Mercurial > hg > MonetDB
changeset 86148:a6f5eda2607b userprofile
Merge with default branch.
| author | Sjoerd Mullender <sjoerd@acm.org> |
|---|---|
| date | Thu, 21 Jul 2022 15:33:41 +0200 |
| parents | b44739543748 (current diff) 0da716c863f9 (diff) |
| children | 0b7fb3a2229c |
| files | clients/Tests/exports.stable.out sql/backends/monet5/sql.c |
| diffstat | 27 files changed, 486 insertions(+), 1192 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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>
--- 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" :
--- 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
--- 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;
--- 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);
--- 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;
--- 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);
--- 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
--- 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: */
--- 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); + querylen = 5000 + (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0); if (addTmpQuery) querylen *= 2; query = malloc(querylen);
--- a/clients/odbc/driver/SQLStatistics.c +++ b/clients/odbc/driver/SQLStatistics.c @@ -167,8 +167,7 @@ MNDBStatistics(ODBCStmt *stmt, || strchr((const char *) SchemaName, '_') != NULL)); /* construct the query */ - querylen = 1200 + strlen(stmt->Dbc->dbname) + - (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0); + querylen = 1200 + (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0); if (addTmpQuery) querylen *= 2; query = malloc(querylen); @@ -191,7 +190,7 @@ MNDBStatistics(ODBCStmt *stmt, VARCHAR FILTER_CONDITION */ 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\", " "cast(sys.ifthenelse(k.name is null,1,0) as smallint) as \"NON_UNIQUE\", " @@ -212,7 +211,6 @@ MNDBStatistics(ODBCStmt *stmt, "%sjoin sys.keys k on (k.name = i.name and i.table_id = k.table_id and k.type in (0, 1)) " "join sys.storage() st on (st.schema = s.name and st.table = t.name and st.column = c.name) " "where 1=1", - stmt->Dbc->dbname, SQL_INDEX_HASHED, SQL_INDEX_OTHER, (Unique == SQL_INDEX_UNIQUE) ? "" : "left outer "); /* by using left outer join we also get indices for tables @@ -241,7 +239,7 @@ MNDBStatistics(ODBCStmt *stmt, which are stored in tmp.idxs, tmp._tables, tmp._columns, tmp.objects and tmp.keys */ 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\", " "cast(sys.ifthenelse(k.name is null,1,0) as smallint) as \"NON_UNIQUE\", " @@ -262,7 +260,6 @@ MNDBStatistics(ODBCStmt *stmt, "%sjoin tmp.keys k on (k.name = i.name and i.table_id = k.table_id and k.type in (0, 1))" "left outer join sys.storage() st on (st.schema = s.name and st.table = t.name and st.column = c.name) " "where 1=1", - stmt->Dbc->dbname, SQL_INDEX_HASHED, SQL_INDEX_OTHER, (Unique == SQL_INDEX_UNIQUE) ? "" : "left outer ");
--- a/clients/odbc/driver/SQLTablePrivileges.c +++ b/clients/odbc/driver/SQLTablePrivileges.c @@ -95,8 +95,7 @@ MNDBTablePrivileges(ODBCStmt *stmt, } /* construct the query now */ - querylen = 1000 + strlen(stmt->Dbc->dbname) + - (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0); + querylen = 1000 + (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0); query = malloc(querylen); if (query == NULL) goto nomem; @@ -112,7 +111,7 @@ MNDBTablePrivileges(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\", " "case a.id " @@ -144,7 +143,6 @@ MNDBTablePrivileges(ODBCStmt *stmt, "t.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" :
--- a/clients/odbc/driver/SQLTables.c +++ b/clients/odbc/driver/SQLTables.c @@ -41,6 +41,7 @@ MNDBTables(ODBCStmt *stmt, /* buffer for the constructed query to do meta data retrieval */ char *query = NULL; + size_t pos = 0; /* convert input string parameters to normal null terminated C * strings */ @@ -75,13 +76,12 @@ MNDBTables(ODBCStmt *stmt, CatalogName && strcmp((char *) CatalogName, SQL_ALL_CATALOGS) == 0) { /* Special case query to fetch all Catalog names. */ - query = strdup("select e.value as \"TABLE_CAT\", " + query = strdup("select cast(null as varchar(1)) as \"TABLE_CAT\", " "cast(null as varchar(1)) as \"TABLE_SCHEM\", " "cast(null as varchar(1)) as \"TABLE_NAME\", " "cast(null as varchar(1)) as \"TABLE_TYPE\", " "cast(null as varchar(1)) as \"REMARKS\" " - "from sys.env() e " - "where e.name = 'gdk_dbname'"); + "where 1=2"); /* return no rows */ if (query == NULL) goto nomem; } else if (NameLength1 == 0 && @@ -117,7 +117,6 @@ MNDBTables(ODBCStmt *stmt, } else { /* no special case argument values */ size_t querylen; - size_t pos = 0; if (stmt->Dbc->sql_attr_metadata_id == SQL_FALSE) { if (NameLength2 > 0) { @@ -152,7 +151,7 @@ MNDBTables(ODBCStmt *stmt, } /* construct the query now */ - querylen = 2000 + strlen(stmt->Dbc->dbname) + + querylen = 2000 + (sch ? strlen(sch) : 0) + (tab ? strlen(tab) : 0) + ((NameLength4 + 1) / 5) * 67; query = malloc(querylen); @@ -160,7 +159,7 @@ MNDBTables(ODBCStmt *stmt, goto nomem; 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\", " "tt.table_type_name as \"TABLE_TYPE\", " @@ -170,7 +169,6 @@ MNDBTables(ODBCStmt *stmt, "sys.table_types tt " "where s.id = t.schema_id and " "t.type = tt.table_type_id", - stmt->Dbc->dbname, stmt->Dbc->has_comment ? "c.remark" : "cast(null as varchar(1))", stmt->Dbc->has_comment ? " left outer join sys.comments c on c.id = t.id" : ""); assert(pos < 1900);
--- a/clients/odbc/tests/ODBCStmtAttr.c +++ b/clients/odbc/tests/ODBCStmtAttr.c @@ -87,7 +87,7 @@ StmtAttribute2name(SQLINTEGER attribute) case SQL_ATTR_QUERY_TIMEOUT: return "SQL_ATTR_QUERY_TIMEOUT"; default: - fprintf(stderr, "StmtAttribute2name: Unexpected value %d\n", attribute); + fprintf(stderr, "StmtAttribute2name: Unexpected value %ld\n", (long) attribute); return "NOT YET IMPLEMENTED"; } }
--- a/clients/odbc/tests/ODBCmetadata.c +++ b/clients/odbc/tests/ODBCmetadata.c @@ -372,10 +372,9 @@ main(int argc, char **argv) (SQLCHAR*)"", SQL_NTS); compareResult(stmt, ret, "SQLTables (SQL_ALL_CATALOGS)", "Resultset with 5 columns\n" - "Resultset with 1 rows\n" + "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS\n" - "WVARCHAR(2048) WVARCHAR(1) WVARCHAR(1) WVARCHAR(1) WVARCHAR(1)\n" - "mTests_sql_odbc_tests NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1) WVARCHAR(1) WVARCHAR(1) WVARCHAR(1)\n"); // All schemas query ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS, @@ -423,14 +422,14 @@ main(int argc, char **argv) "Resultset with 5 columns\n" "Resultset with 7 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n" - "mTests_sql_odbc_tests odbctst CUSTOMERS TABLE NULL\n" - "mTests_sql_odbc_tests odbctst LINES TABLE NULL\n" - "mTests_sql_odbc_tests odbctst ORDERS TABLE NULL\n" - "mTests_sql_odbc_tests odbctst fk2c TABLE NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs TABLE NULL\n" - "mTests_sql_odbc_tests odbctst pk2c TABLE NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc TABLE NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n" + "NULL odbctst CUSTOMERS TABLE NULL\n" + "NULL odbctst LINES TABLE NULL\n" + "NULL odbctst ORDERS TABLE NULL\n" + "NULL odbctst fk2c TABLE NULL\n" + "NULL odbctst nopk_twoucs TABLE NULL\n" + "NULL odbctst pk2c TABLE NULL\n" + "NULL odbctst pk_uc TABLE NULL\n"); // All user tables and views ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS, @@ -440,18 +439,18 @@ main(int argc, char **argv) "Resultset with 5 columns\n" "Resultset with 11 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs GLOBAL TEMPORARY TABLE NULL\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc GLOBAL TEMPORARY TABLE NULL\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs LOCAL TEMPORARY TABLE NULL\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc LOCAL TEMPORARY TABLE NULL\n" - "mTests_sql_odbc_tests odbctst CUSTOMERS TABLE NULL\n" - "mTests_sql_odbc_tests odbctst LINES TABLE NULL\n" - "mTests_sql_odbc_tests odbctst ORDERS TABLE NULL\n" - "mTests_sql_odbc_tests odbctst fk2c TABLE NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs TABLE NULL\n" - "mTests_sql_odbc_tests odbctst pk2c TABLE NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc TABLE NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n" + "NULL tmp glbl_nopk_twoucs GLOBAL TEMPORARY TABLE NULL\n" + "NULL tmp glbl_pk_uc GLOBAL TEMPORARY TABLE NULL\n" + "NULL tmp tmp_nopk_twoucs LOCAL TEMPORARY TABLE NULL\n" + "NULL tmp tmp_pk_uc LOCAL TEMPORARY TABLE NULL\n" + "NULL odbctst CUSTOMERS TABLE NULL\n" + "NULL odbctst LINES TABLE NULL\n" + "NULL odbctst ORDERS TABLE NULL\n" + "NULL odbctst fk2c TABLE NULL\n" + "NULL odbctst nopk_twoucs TABLE NULL\n" + "NULL odbctst pk2c TABLE NULL\n" + "NULL odbctst pk_uc TABLE NULL\n"); // All columns of odbctst tables containg 'pk' in their name ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS, @@ -461,14 +460,14 @@ main(int argc, char **argv) "Resultset with 18 columns\n" "Resultset with 7 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 -9 VARCHAR 99 198 NULL NULL 0 NULL NULL -9 NULL 198 2 NO\n" - "mTests_sql_odbc_tests odbctst pk2c name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 3 YES\n" - "mTests_sql_odbc_tests odbctst pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests odbctst pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" + "NULL odbctst nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL odbctst nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL odbctst pk2c pkc1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL odbctst pk2c pkc2 -9 VARCHAR 99 198 NULL NULL 0 NULL NULL -9 NULL 198 2 NO\n" + "NULL odbctst pk2c name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 3 YES\n" + "NULL odbctst pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL odbctst pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); // All columns of all tmp tables containg 'pk' in their name ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS, @@ -478,15 +477,15 @@ main(int argc, char **argv) "Resultset with 18 columns\n" "Resultset with 8 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" + "NULL tmp glbl_nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL tmp glbl_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp glbl_pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL tmp glbl_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp tmp_nopk_twoucs id2 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL tmp tmp_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp tmp_pk_uc id1 4 INTEGER 32 11 0 2 0 NULL NULL 4 NULL NULL 1 NO\n" + "NULL tmp tmp_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); // All columns of all tmp tables containg 'pk' in their name and the column matching name_ pattern ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS, @@ -496,11 +495,11 @@ main(int argc, char **argv) "Resultset with 18 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT BIGINT INTEGER WVARCHAR(3)\n" + "NULL tmp glbl_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp glbl_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp tmp_nopk_twoucs name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n" + "NULL tmp tmp_pk_uc name1 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL 198 2 YES\n"); // sys.table_types ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -509,8 +508,8 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 1 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests sys table_types table_type_id 1 table_types_table_type_id_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL sys table_types table_type_id 1 table_types_table_type_id_pkey\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types", SQL_NTS, @@ -529,9 +528,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests sys table_types 0 NULL table_types_table_type_id_pkey 2 1 table_type_id NULL 10 NULL NULL\n" - "mTests_sql_odbc_tests sys table_types 0 NULL table_types_table_type_name_unique 2 1 table_type_name NULL 10 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL sys table_types 0 NULL table_types_table_type_id_pkey 2 1 table_type_id NULL 10 NULL NULL\n" + "NULL sys table_types 0 NULL table_types_table_type_name_unique 2 1 table_type_name NULL 10 NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types", SQL_NTS, @@ -540,9 +539,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests sys table_types 0 NULL table_types_table_type_id_pkey 2 1 table_type_id NULL 10 NULL NULL\n" - "mTests_sql_odbc_tests sys table_types 0 NULL table_types_table_type_name_unique 2 1 table_type_name NULL 10 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL sys table_types 0 NULL table_types_table_type_id_pkey 2 1 table_type_id NULL 10 NULL NULL\n" + "NULL sys table_types 0 NULL table_types_table_type_name_unique 2 1 table_type_name NULL 10 NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types", SQL_NTS); @@ -550,7 +549,7 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types", SQL_NTS, @@ -559,7 +558,7 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); // odbctst.pk_uc ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -568,8 +567,8 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 1 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests odbctst pk_uc id1 1 pk_uc_id1_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL odbctst pk_uc id1 1 pk_uc_id1_pkey\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc", SQL_NTS, @@ -597,9 +596,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests odbctst pk_uc 0 NULL pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc 0 NULL pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL odbctst pk_uc 0 NULL pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" + "NULL odbctst pk_uc 0 NULL pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc", SQL_NTS, @@ -608,11 +607,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests odbctst pk_uc 0 NULL pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc 0 NULL pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc 1 NULL pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests odbctst pk_uc 1 NULL pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL odbctst pk_uc 0 NULL pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" + "NULL odbctst pk_uc 0 NULL pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n" + "NULL odbctst pk_uc 1 NULL pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" + "NULL odbctst pk_uc 1 NULL pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc", SQL_NTS); @@ -620,11 +619,11 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests odbctst pk_uc _SYSTEM monetdb DELETE NO\n" - "mTests_sql_odbc_tests odbctst pk_uc _SYSTEM monetdb INSERT NO\n" - "mTests_sql_odbc_tests odbctst pk_uc monetdb PUBLIC SELECT NO\n" - "mTests_sql_odbc_tests odbctst pk_uc _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL odbctst pk_uc _SYSTEM monetdb DELETE NO\n" + "NULL odbctst pk_uc _SYSTEM monetdb INSERT NO\n" + "NULL odbctst pk_uc monetdb PUBLIC SELECT NO\n" + "NULL odbctst pk_uc _SYSTEM monetdb UPDATE NO\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc", SQL_NTS, @@ -633,7 +632,7 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); // tmp.tmp_pk_uc ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -642,8 +641,8 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 1 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc id1 1 tmp_pk_uc_id1_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL tmp tmp_pk_uc id1 1 tmp_pk_uc_id1_pkey\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_pk_uc", SQL_NTS, @@ -662,9 +661,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 0 NULL tmp_pk_uc_id1_pkey 2 1 id1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 0 NULL tmp_pk_uc_name1_unique 2 1 name1 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp tmp_pk_uc 0 NULL tmp_pk_uc_id1_pkey 2 1 id1 NULL NULL NULL NULL\n" + "NULL tmp tmp_pk_uc 0 NULL tmp_pk_uc_name1_unique 2 1 name1 NULL NULL NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_pk_uc", SQL_NTS, @@ -673,11 +672,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 0 NULL tmp_pk_uc_id1_pkey 2 1 id1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 0 NULL tmp_pk_uc_name1_unique 2 1 name1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 1 NULL tmp_pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc 1 NULL tmp_pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp tmp_pk_uc 0 NULL tmp_pk_uc_id1_pkey 2 1 id1 NULL NULL NULL NULL\n" + "NULL tmp tmp_pk_uc 0 NULL tmp_pk_uc_name1_unique 2 1 name1 NULL NULL NULL NULL\n" + "NULL tmp tmp_pk_uc 1 NULL tmp_pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" + "NULL tmp tmp_pk_uc 1 NULL tmp_pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_pk_uc", SQL_NTS); @@ -685,9 +684,9 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc _SYSTEM monetdb DELETE NO\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc _SYSTEM monetdb INSERT NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp tmp_pk_uc _SYSTEM monetdb DELETE NO\n" + "NULL tmp tmp_pk_uc _SYSTEM monetdb INSERT NO\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_pk_uc", SQL_NTS, @@ -696,10 +695,10 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 3 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc id1 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc name1 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp tmp_pk_uc name1 _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp tmp_pk_uc id1 _SYSTEM monetdb SELECT NO\n" + "NULL tmp tmp_pk_uc name1 _SYSTEM monetdb SELECT NO\n" + "NULL tmp tmp_pk_uc name1 _SYSTEM monetdb UPDATE NO\n"); // tmp.glbl_pk_uc ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -708,8 +707,8 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 1 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc id1 1 glbl_pk_uc_id1_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL tmp glbl_pk_uc id1 1 glbl_pk_uc_id1_pkey\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_pk_uc", SQL_NTS, @@ -728,9 +727,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 0 NULL glbl_pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 0 NULL glbl_pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp glbl_pk_uc 0 NULL glbl_pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" + "NULL tmp glbl_pk_uc 0 NULL glbl_pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_pk_uc", SQL_NTS, @@ -739,11 +738,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 0 NULL glbl_pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 0 NULL glbl_pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 1 NULL glbl_pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc 1 NULL glbl_pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp glbl_pk_uc 0 NULL glbl_pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n" + "NULL tmp glbl_pk_uc 0 NULL glbl_pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n" + "NULL tmp glbl_pk_uc 1 NULL glbl_pk_uc_i 2 1 id1 NULL NULL NULL NULL\n" + "NULL tmp glbl_pk_uc 1 NULL glbl_pk_uc_i 2 2 name1 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_pk_uc", SQL_NTS); @@ -751,9 +750,9 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc _SYSTEM monetdb DELETE NO\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc _SYSTEM monetdb INSERT NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp glbl_pk_uc _SYSTEM monetdb DELETE NO\n" + "NULL tmp glbl_pk_uc _SYSTEM monetdb INSERT NO\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_pk_uc", SQL_NTS, @@ -762,10 +761,10 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 3 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc id1 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc name1 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp glbl_pk_uc name1 _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp glbl_pk_uc id1 _SYSTEM monetdb SELECT NO\n" + "NULL tmp glbl_pk_uc name1 _SYSTEM monetdb SELECT NO\n" + "NULL tmp glbl_pk_uc name1 _SYSTEM monetdb UPDATE NO\n"); // odbctst.nopk_twoucs ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -774,7 +773,7 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs", SQL_NTS, @@ -793,9 +792,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 0 NULL nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 0 NULL nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL odbctst nopk_twoucs 0 NULL nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" + "NULL odbctst nopk_twoucs 0 NULL nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs", SQL_NTS, @@ -804,11 +803,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 0 NULL nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 0 NULL nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 1 NULL nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs 1 NULL nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL odbctst nopk_twoucs 0 NULL nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" + "NULL odbctst nopk_twoucs 0 NULL nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n" + "NULL odbctst nopk_twoucs 1 NULL nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" + "NULL odbctst nopk_twoucs 1 NULL nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs", SQL_NTS); @@ -816,7 +815,7 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs", SQL_NTS, @@ -825,10 +824,10 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 3 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests odbctst nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL odbctst nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" + "NULL odbctst nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" + "NULL odbctst nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); // tmp.tmp_nopk_twoucs ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -837,7 +836,7 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_nopk_twoucs", SQL_NTS, @@ -856,9 +855,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_id2_unique 2 1 id2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_name2_unique 2 1 name2 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_id2_unique 2 1 id2 NULL NULL NULL NULL\n" + "NULL tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_name2_unique 2 1 name2 NULL NULL NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_nopk_twoucs", SQL_NTS, @@ -867,11 +866,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_id2_unique 2 1 id2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_name2_unique 2 1 name2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 1 NULL tmp_nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs 1 NULL tmp_nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_id2_unique 2 1 id2 NULL NULL NULL NULL\n" + "NULL tmp tmp_nopk_twoucs 0 NULL tmp_nopk_twoucs_name2_unique 2 1 name2 NULL NULL NULL NULL\n" + "NULL tmp tmp_nopk_twoucs 1 NULL tmp_nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" + "NULL tmp tmp_nopk_twoucs 1 NULL tmp_nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_nopk_twoucs", SQL_NTS); @@ -879,9 +878,9 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs _SYSTEM monetdb DELETE NO\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs _SYSTEM monetdb INSERT NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp tmp_nopk_twoucs _SYSTEM monetdb DELETE NO\n" + "NULL tmp tmp_nopk_twoucs _SYSTEM monetdb INSERT NO\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_nopk_twoucs", SQL_NTS, @@ -890,10 +889,10 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 3 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp tmp_nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp tmp_nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" + "NULL tmp tmp_nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" + "NULL tmp tmp_nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); // tmp.glbl_nopk_twoucs ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS, @@ -902,7 +901,7 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n"); ret = SQLSpecialColumns(stmt, SQL_BEST_ROWID, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_nopk_twoucs", SQL_NTS, @@ -921,9 +920,9 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" + "NULL tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n"); ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_nopk_twoucs", SQL_NTS, @@ -932,11 +931,11 @@ main(int argc, char **argv) "Resultset with 13 columns\n" "Resultset with 4 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 1 NULL glbl_nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs 1 NULL glbl_nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1) WVARCHAR(1024) SMALLINT SMALLINT WVARCHAR(1024) WCHAR(1) INTEGER INTEGER WVARCHAR(1)\n" + "NULL tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_id2_unique 2 1 id2 NULL 0 NULL NULL\n" + "NULL tmp glbl_nopk_twoucs 0 NULL glbl_nopk_twoucs_name2_unique 2 1 name2 NULL 0 NULL NULL\n" + "NULL tmp glbl_nopk_twoucs 1 NULL glbl_nopk_twoucs_i 2 1 id2 NULL NULL NULL NULL\n" + "NULL tmp glbl_nopk_twoucs 1 NULL glbl_nopk_twoucs_i 2 2 name2 NULL NULL NULL NULL\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_nopk_twoucs", SQL_NTS); @@ -944,9 +943,9 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs _SYSTEM monetdb DELETE NO\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs _SYSTEM monetdb INSERT NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp glbl_nopk_twoucs _SYSTEM monetdb DELETE NO\n" + "NULL tmp glbl_nopk_twoucs _SYSTEM monetdb INSERT NO\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_nopk_twoucs", SQL_NTS, @@ -955,10 +954,10 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 3 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" - "mTests_sql_odbc_tests tmp glbl_nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n" + "NULL tmp glbl_nopk_twoucs id2 _SYSTEM monetdb SELECT NO\n" + "NULL tmp glbl_nopk_twoucs name2 _SYSTEM monetdb SELECT NO\n" + "NULL tmp glbl_nopk_twoucs name2 _SYSTEM monetdb UPDATE NO\n"); // odbctst.CUSTOMERS, odbctst.ORDERS and odbctst.LINES /* next tests are copied from code examples on https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/sqlforeignkeys-function?view=sql-server-ver15 */ @@ -967,24 +966,24 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 1 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests odbctst ORDERS ORDERID 1 ORDERS_ORDERID_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL odbctst ORDERS ORDERID 1 ORDERS_ORDERID_pkey\n"); ret = SQLForeignKeys(stmt, NULL, 0, NULL, 0, (SQLCHAR*)"ORDERS", SQL_NTS, NULL, 0, NULL, 0, NULL, 0); compareResult(stmt, ret, "SQLForeignKeys (NULL, ORDERS, NULL, NULL)", "Resultset with 14 columns\n" "Resultset with 1 rows\n" "PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" - "mTests_sql_odbc_tests odbctst ORDERS ORDERID mTests_sql_odbc_tests odbctst LINES ORDERID 1 1 1 LINES_ORDERID_fkey ORDERS_ORDERID_pkey 7\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" + "NULL odbctst ORDERS ORDERID NULL odbctst LINES ORDERID 1 1 1 LINES_ORDERID_fkey ORDERS_ORDERID_pkey 7\n"); ret = SQLForeignKeys(stmt, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, (SQLCHAR*)"ORDERS", SQL_NTS); compareResult(stmt, ret, "SQLForeignKeys (NULL, NULL, NULL, ORDERS)", "Resultset with 14 columns\n" "Resultset with 1 rows\n" "PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" - "mTests_sql_odbc_tests odbctst CUSTOMERS CUSTID mTests_sql_odbc_tests odbctst ORDERS CUSTID 1 1 1 ORDERS_CUSTID_fkey CUSTOMERS_CUSTID_pkey 7\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" + "NULL odbctst CUSTOMERS CUSTID NULL odbctst ORDERS CUSTID 1 1 1 ORDERS_CUSTID_fkey CUSTOMERS_CUSTID_pkey 7\n"); /* odbctst.pk2c and odbctst.fk2c (tests multi-column pks and multiple multi-column fks from one table */ ret = SQLPrimaryKeys(stmt, NULL, 0, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk2c", SQL_NTS); @@ -992,9 +991,9 @@ main(int argc, char **argv) "Resultset with 6 columns\n" "Resultset with 2 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 1 pk2c_pkc2_pkc1_pkey\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 2 pk2c_pkc2_pkc1_pkey\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT WVARCHAR(1024)\n" + "NULL odbctst pk2c pkc2 1 pk2c_pkc2_pkc1_pkey\n" + "NULL odbctst pk2c pkc1 2 pk2c_pkc2_pkc1_pkey\n"); ret = SQLForeignKeys(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk2c", SQL_NTS, @@ -1004,11 +1003,11 @@ main(int argc, char **argv) "Resultset with 14 columns\n" "Resultset with 4 rows\n" "PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); ret = SQLForeignKeys(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"", SQL_NTS, @@ -1018,11 +1017,11 @@ main(int argc, char **argv) "Resultset with 14 columns\n" "Resultset with 4 rows\n" "PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); ret = SQLForeignKeys(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk2c", SQL_NTS, @@ -1032,11 +1031,11 @@ main(int argc, char **argv) "Resultset with 14 columns\n" "Resultset with 4 rows\n" "PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc2 mTests_sql_odbc_tests odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" - "mTests_sql_odbc_tests odbctst pk2c pkc1 mTests_sql_odbc_tests odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) SMALLINT SMALLINT SMALLINT WVARCHAR(1024) WVARCHAR(1024) SMALLINT\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc1 2 0 1 fk2c_fkc2_fkc1_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc2 NULL odbctst fk2c fkc2 1 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n" + "NULL odbctst pk2c pkc1 NULL odbctst fk2c fkc3 2 2 3 fk2c_fkc2_fkc3_fkey pk2c_pkc2_pkc1_pkey 7\n"); ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_2c", SQL_NTS); @@ -1044,7 +1043,7 @@ main(int argc, char **argv) "Resultset with 7 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_2c", SQL_NTS, @@ -1053,7 +1052,7 @@ main(int argc, char **argv) "Resultset with 8 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"); // test procedure sys.analyze(). There are 4 overloaded variants of this procedure in MonetDB with 0, 1, 2 or 3 input parameters. @@ -1063,11 +1062,11 @@ main(int argc, char **argv) "Resultset with 9 columns\n" "Resultset with 4 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME NUM_INPUT_PARAMS NUM_OUTPUT_PARAMS NUM_RESULT_SETS REMARKS PROCEDURE_TYPE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys analyze 0 0 0 NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze 0 0 0 NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze 0 0 0 NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze 0 0 0 NULL 1 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" + "NULL sys analyze 0 0 0 NULL 1 replacedId\n" + "NULL sys analyze 0 0 0 NULL 1 replacedId\n" + "NULL sys analyze 0 0 0 NULL 1 replacedId\n" + "NULL sys analyze 0 0 0 NULL 1 replacedId\n"); ret = SQLProcedureColumns(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"analyze", SQL_NTS, @@ -1076,13 +1075,13 @@ main(int argc, char **argv) "Resultset with 20 columns\n" "Resultset with 6 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys analyze tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys analyze cname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" + "NULL sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys analyze tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys analyze sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys analyze tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys analyze cname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n"); // test function sys.sin(). There are 2 overloaded variants of this function in MonetDB: sys.sin(real) and sys.sin(double). ret = SQLProcedures(stmt, (SQLCHAR*)"", SQL_NTS, @@ -1091,9 +1090,9 @@ main(int argc, char **argv) "Resultset with 9 columns\n" "Resultset with 2 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME NUM_INPUT_PARAMS NUM_OUTPUT_PARAMS NUM_RESULT_SETS REMARKS PROCEDURE_TYPE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys sin 0 0 0 NULL 2 replacedId\n" - "mTests_sql_odbc_tests sys sin 0 0 0 NULL 2 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" + "NULL sys sin 0 0 0 NULL 2 replacedId\n" + "NULL sys sin 0 0 0 NULL 2 replacedId\n"); ret = SQLProcedureColumns(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"sin", SQL_NTS, @@ -1102,11 +1101,11 @@ main(int argc, char **argv) "Resultset with 20 columns\n" "Resultset with 4 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys sin arg_1 1 7 REAL 24 14 7 2 2 NULL NULL 7 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys sin res_0 5 7 REAL 24 14 7 2 2 NULL NULL 7 NULL NULL 0 replacedId\n" - "mTests_sql_odbc_tests sys sin arg_1 1 8 DOUBLE 53 24 15 2 2 NULL NULL 8 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys sin res_0 5 8 DOUBLE 53 24 15 2 2 NULL NULL 8 NULL NULL 0 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" + "NULL sys sin arg_1 1 7 REAL 24 14 7 2 2 NULL NULL 7 NULL NULL 1 replacedId\n" + "NULL sys sin res_0 5 7 REAL 24 14 7 2 2 NULL NULL 7 NULL NULL 0 replacedId\n" + "NULL sys sin arg_1 1 8 DOUBLE 53 24 15 2 2 NULL NULL 8 NULL NULL 1 replacedId\n" + "NULL sys sin res_0 5 8 DOUBLE 53 24 15 2 2 NULL NULL 8 NULL NULL 0 replacedId\n"); // test table returning function sys.env(). It has no input parameters. Only 2 result columns. ret = SQLProcedures(stmt, (SQLCHAR*)"", SQL_NTS, @@ -1115,8 +1114,8 @@ main(int argc, char **argv) "Resultset with 9 columns\n" "Resultset with 1 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME NUM_INPUT_PARAMS NUM_OUTPUT_PARAMS NUM_RESULT_SETS REMARKS PROCEDURE_TYPE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys env 0 0 0 NULL 2 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" + "NULL sys env 0 0 0 NULL 2 replacedId\n"); ret = SQLProcedureColumns(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"env", SQL_NTS, @@ -1125,9 +1124,9 @@ main(int argc, char **argv) "Resultset with 20 columns\n" "Resultset with 2 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys env name 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys env value 3 -9 VARCHAR 2048 4096 NULL NULL 2 NULL NULL -9 NULL 4096 2 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" + "NULL sys env name 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys env value 3 -9 VARCHAR 2048 4096 NULL NULL 2 NULL NULL -9 NULL 4096 2 replacedId\n"); // test table returning function sys.statistics(). 4 overloaded variants with 0, 1, 2 or 3 input parameters. 13 result columns. ret = SQLProcedures(stmt, (SQLCHAR*)"", SQL_NTS, @@ -1136,11 +1135,11 @@ main(int argc, char **argv) "Resultset with 9 columns\n" "Resultset with 4 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME NUM_INPUT_PARAMS NUM_OUTPUT_PARAMS NUM_RESULT_SETS REMARKS PROCEDURE_TYPE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" - "mTests_sql_odbc_tests sys statistics 0 0 0 NULL 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics 0 0 0 NULL 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics 0 0 0 NULL 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics 0 0 0 NULL 2 replacedId\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) TINYINT TINYINT TINYINT WVARCHAR(65000) SMALLINT WVARCHAR(10)\n" + "NULL sys statistics 0 0 0 NULL 2 replacedId\n" + "NULL sys statistics 0 0 0 NULL 2 replacedId\n" + "NULL sys statistics 0 0 0 NULL 2 replacedId\n" + "NULL sys statistics 0 0 0 NULL 2 replacedId\n"); ret = SQLProcedureColumns(stmt, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"statistics", SQL_NTS, @@ -1149,72 +1148,72 @@ main(int argc, char **argv) "Resultset with 20 columns\n" "Resultset with 58 rows\n" "PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256) TINYINT SMALLINT WCHAR(25) INTEGER BIGINT BIGINT SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT SMALLINT BIGINT BIGINT WCHAR WVARCHAR(10)\n" // 0 input argument and 13 result columns of sys.statistics() - "mTests_sql_odbc_tests sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" - "mTests_sql_odbc_tests sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" - "mTests_sql_odbc_tests sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" - "mTests_sql_odbc_tests sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" - "mTests_sql_odbc_tests sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" - "mTests_sql_odbc_tests sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" - "mTests_sql_odbc_tests sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" - "mTests_sql_odbc_tests sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" - "mTests_sql_odbc_tests sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" - "mTests_sql_odbc_tests sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" - "mTests_sql_odbc_tests sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" + "NULL sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" + "NULL sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" + "NULL sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" + "NULL sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" + "NULL sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" + "NULL sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" + "NULL sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" + "NULL sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" + "NULL sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" + "NULL sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" + "NULL sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" + "NULL sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" // 1 input argument and 13 result columns of sys.statistics(sname) - "mTests_sql_odbc_tests sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" - "mTests_sql_odbc_tests sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" - "mTests_sql_odbc_tests sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" - "mTests_sql_odbc_tests sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" - "mTests_sql_odbc_tests sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" - "mTests_sql_odbc_tests sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" - "mTests_sql_odbc_tests sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" - "mTests_sql_odbc_tests sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" - "mTests_sql_odbc_tests sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" - "mTests_sql_odbc_tests sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" - "mTests_sql_odbc_tests sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" + "NULL sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" + "NULL sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" + "NULL sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" + "NULL sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" + "NULL sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" + "NULL sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" + "NULL sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" + "NULL sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" + "NULL sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" + "NULL sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" + "NULL sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" + "NULL sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" // 2 input arguments and 13 result columns of sys.statistics(sname, tname) - "mTests_sql_odbc_tests sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" - "mTests_sql_odbc_tests sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" - "mTests_sql_odbc_tests sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" - "mTests_sql_odbc_tests sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" - "mTests_sql_odbc_tests sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" - "mTests_sql_odbc_tests sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" - "mTests_sql_odbc_tests sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" - "mTests_sql_odbc_tests sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" - "mTests_sql_odbc_tests sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" - "mTests_sql_odbc_tests sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" - "mTests_sql_odbc_tests sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" + "NULL sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys statistics tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" + "NULL sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" + "NULL sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" + "NULL sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" + "NULL sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" + "NULL sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" + "NULL sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" + "NULL sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" + "NULL sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" + "NULL sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" + "NULL sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" + "NULL sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n" // 3 input arguments and 13 result columns of sys.statistics(sname, tname, cname) - "mTests_sql_odbc_tests sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics cname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" - "mTests_sql_odbc_tests sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" - "mTests_sql_odbc_tests sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" - "mTests_sql_odbc_tests sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" - "mTests_sql_odbc_tests sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" - "mTests_sql_odbc_tests sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" - "mTests_sql_odbc_tests sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" - "mTests_sql_odbc_tests sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" - "mTests_sql_odbc_tests sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" - "mTests_sql_odbc_tests sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" - "mTests_sql_odbc_tests sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" - "mTests_sql_odbc_tests sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" - "mTests_sql_odbc_tests sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" - "mTests_sql_odbc_tests sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n"); + "NULL sys statistics sname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 1 replacedId\n" + "NULL sys statistics tname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics cname 1 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" + "NULL sys statistics column_id 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 1 replacedId\n" + "NULL sys statistics schema 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 2 replacedId\n" + "NULL sys statistics table 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 3 replacedId\n" + "NULL sys statistics column 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 4 replacedId\n" + "NULL sys statistics type 3 -9 VARCHAR 1024 2048 NULL NULL 2 NULL NULL -9 NULL 2048 5 replacedId\n" + "NULL sys statistics width 3 4 INTEGER 32 11 0 2 2 NULL NULL 4 NULL NULL 6 replacedId\n" + "NULL sys statistics count 3 -5 BIGINT 64 20 0 2 2 NULL NULL -5 NULL NULL 7 replacedId\n" + "NULL sys statistics unique 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 8 replacedId\n" + "NULL sys statistics nils 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 9 replacedId\n" + "NULL sys statistics minval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 10 replacedId\n" + "NULL sys statistics maxval 3 -10 CHARACTER LARGE OBJECT 0 0 NULL NULL 2 NULL NULL -10 NULL 0 11 replacedId\n" + "NULL sys statistics sorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 12 replacedId\n" + "NULL sys statistics revsorted 3 -7 BOOLEAN 1 1 NULL NULL 2 NULL NULL -7 NULL NULL 13 replacedId\n"); ret = SQLGetTypeInfo(stmt, SQL_ALL_TYPES); compareResult(stmt, ret, "SQLGetTypeInfo(stmt, SQL_ALL_TYPES)", @@ -1364,7 +1363,7 @@ main(int argc, char **argv) "Resultset with 5 columns\n" "Resultset with 0 rows\n" "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS\n" - "WCHAR(21) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n"); + "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25) WVARCHAR(65000)\n"); ret = SQLExecDirect(stmt, (SQLCHAR *) "SET SCHEMA sys;\n"
--- a/common/stream/CMakeLists.txt +++ b/common/stream/CMakeLists.txt @@ -21,7 +21,6 @@ target_sources(stream rw.c bstream.c bs.c - bs2.c stdio_stream.c winio.c compressed.c @@ -31,6 +30,7 @@ target_sources(stream lz4_stream.c url_stream.c socket_stream.c + mapi_stream.c memio.c callback.c blackhole.c @@ -41,6 +41,7 @@ target_sources(stream stream.h stream_internal.h stream_socket.h + mapi_prompt.h pump.h PUBLIC ${stream_public_headers})
--- a/common/stream/bs.c +++ b/common/stream/bs.c @@ -17,8 +17,6 @@ * indicated by an empty block (i.e. just a count of 0). */ -static ssize_t bs_read_internal(stream *restrict ss, void *restrict buf, size_t elmsize, size_t cnt); - static bs * bs_create(void) { @@ -168,29 +166,6 @@ bs_flush(stream *ss, mnstr_flush_level f ssize_t bs_read(stream *restrict ss, void *restrict buf, size_t elmsize, size_t cnt) { - ssize_t ret = bs_read_internal(ss, buf, elmsize, cnt); - if (ret != 0 || ss->eof) - return ret; - - bs *b = (bs*) ss-> stream_data.p; - if (b->prompt == NULL || b->pstream == NULL) - return 0; - - // before returning the 0 we send the prompt and make another attempt. - if (mnstr_write(b->pstream, b->prompt, strlen(b->prompt), 1) != 1) - return -1; - if (mnstr_flush(b->pstream, MNSTR_FLUSH_DATA) < 0) - return -1; - - // if it succeeds, return that to the client. - // if it's still a block boundary, return that to the client. - // if there's an error, return that to the client. - return bs_read_internal(ss, buf, elmsize, cnt); -} - -static ssize_t -bs_read_internal(stream *restrict ss, void *restrict buf, size_t elmsize, size_t cnt) -{ bs *s; size_t todo = cnt * elmsize; size_t n; @@ -397,13 +372,3 @@ block_stream(stream *s) return ns; } - -void -set_prompting(stream *block_stream, const char *prompt, stream *prompt_stream) -{ - if (isa_block_stream(block_stream)) { - bs *bs = block_stream->stream_data.p; - bs->prompt = prompt; - bs->pstream = prompt_stream; - } -}
deleted file mode 100644 --- a/common/stream/bs2.c +++ /dev/null @@ -1,670 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. - */ - -#include "monetdb_config.h" -#include "stream.h" -#include "stream_internal.h" - - -/* ------------------------------------------------------------------ */ -typedef struct bs2 { - stream *s; /* underlying stream */ - size_t nr; /* how far we got in buf */ - size_t itotal; /* amount available in current read block */ - size_t bufsiz; - size_t readpos; - compression_method comp; - char *compbuf; - size_t compbufsiz; - char *buf; -} bs2; - - -static ssize_t -compress_stream_data(bs2 *s) -{ - assert(s->comp != COMPRESSION_NONE); - if (s->comp == COMPRESSION_SNAPPY) { -#ifdef HAVE_SNAPPY - size_t compressed_length = s->compbufsiz; - snappy_status ret; - if ((ret = snappy_compress(s->buf, s->nr, s->compbuf, &compressed_length)) != SNAPPY_OK) { - return -1; - } - return compressed_length; -#else - assert(0); - return -1; -#endif - } else if (s->comp == COMPRESSION_LZ4) { -#ifdef HAVE_LIBLZ4 - int compressed_length = (int) s->compbufsiz; - assert(s->nr < INT_MAX); - if ((compressed_length = LZ4_compress_fast(s->buf, s->compbuf, (int)s->nr, compressed_length, 1)) == 0) { - return -1; - } - return compressed_length; -#else - assert(0); - return -1; -#endif - } - return -1; -} - - -static ssize_t -decompress_stream_data(bs2 *s) -{ - assert(s->comp != COMPRESSION_NONE); - if (s->comp == COMPRESSION_SNAPPY) { -#ifdef HAVE_SNAPPY - snappy_status ret; - size_t uncompressed_length = s->bufsiz; - if ((ret = snappy_uncompress(s->compbuf, s->itotal, s->buf, &uncompressed_length)) != SNAPPY_OK) { - return -1; - } - return (ssize_t) uncompressed_length; -#else - assert(0); - return -1; -#endif - } else if (s->comp == COMPRESSION_LZ4) { -#ifdef HAVE_LIBLZ4 - int uncompressed_length = (int) s->bufsiz; - assert(s->itotal < INT_MAX); - if ((uncompressed_length = LZ4_decompress_safe(s->compbuf, s->buf, (int)s->itotal, uncompressed_length)) <= 0) { - return -1; - } - return uncompressed_length; -#else - assert(0); - return -1; -#endif - } - return -1; -} - -static ssize_t -compression_size_bound(bs2 *s) -{ - if (s->comp == COMPRESSION_NONE) { - return 0; - } else if (s->comp == COMPRESSION_SNAPPY) { -#ifndef HAVE_SNAPPY - return -1; -#else - return snappy_max_compressed_length(s->bufsiz); -#endif - } else if (s->comp == COMPRESSION_LZ4) { -#ifndef HAVE_LIBLZ4 - return -1; -#else - assert(s->bufsiz < INT_MAX); - return LZ4_compressBound((int)s->bufsiz); -#endif - } - return -1; -} - -static bs2 * -bs2_create(stream *s, size_t bufsiz, compression_method comp) -{ - /* should be a binary stream */ - bs2 *ns; - ssize_t compress_bound = 0; - - if ((ns = malloc(sizeof(*ns))) == NULL) - return NULL; - *ns = (bs2) { - .buf = malloc(bufsiz), - .s = s, - .bufsiz = bufsiz, - .comp = comp, - }; - if (ns->buf == NULL) { - free(ns); - return NULL; - } - - compress_bound = compression_size_bound(ns); - if (compress_bound > 0) { - ns->compbufsiz = (size_t) compress_bound; - ns->compbuf = malloc(ns->compbufsiz); - if (!ns->compbuf) { - free(ns->buf); - free(ns); - return NULL; - } - } else if (compress_bound < 0) { - free(ns->buf); - free(ns); - return NULL; - } - return ns; -} - -/* Collect data until the internal buffer is filled, then write the - * filled buffer to the underlying stream. - * Struct field usage: - * s - the underlying stream; - * buf - the buffer in which data is collected; - * nr - how much of buf is already filled (if nr == sizeof(buf) the - * data is written to the underlying stream, so upon entry nr < - * sizeof(buf)); - * itotal - unused. - */ -ssize_t -bs2_write(stream *restrict ss, const void *restrict buf, size_t elmsize, size_t cnt) -{ - bs2 *s; - size_t todo = cnt * elmsize; - int64_t blksize; - char *writebuf; - size_t writelen; - - s = (bs2 *) ss->stream_data.p; - if (s == NULL) - return -1; - assert(!ss->readonly); - assert(s->nr < s->bufsiz); - while (todo > 0) { - size_t n = s->bufsiz - s->nr; - - if (todo < n) - n = todo; - memcpy(s->buf + s->nr, buf, n); - s->nr += n; - todo -= n; - buf = ((const char *) buf + n); - /* block is full, write it to the stream */ - if (s->nr == s->bufsiz) { - -#ifdef BSTREAM_DEBUG - { - size_t i; - - fprintf(stderr, "W %s %zu \"", ss->name, s->nr); - for (i = 0; i < s->nr; i++) - if (' ' <= s->buf[i] && s->buf[i] < 127) - putc(s->buf[i], stderr); - else - fprintf(stderr, "\\%03o", (unsigned char) s->buf[i]); - fprintf(stderr, "\"\n"); - } -#endif - - writelen = s->nr; - blksize = (int64_t) s->nr; - writebuf = s->buf; - - if (s->comp != COMPRESSION_NONE) { - ssize_t compressed_length = compress_stream_data(s); - if (compressed_length < 0) { - return -1; - } - writebuf = s->compbuf; - blksize = (int64_t) compressed_length; - writelen = (size_t) compressed_length; - } - - - /* the last bit tells whether a flush is in there, it's not - * at this moment, so shift it to the left */ - blksize <<= 1; - if (!mnstr_writeLng(s->s, blksize) || - s->s->write(s->s, writebuf, 1, writelen) != (ssize_t) writelen) { - mnstr_copy_error(ss, s->s); - return -1; - } - s->nr = 0; - } - } - return (ssize_t) cnt; -} - -/* If the internal buffer is partially filled, write it to the - * underlying stream. Then in any case write an empty buffer to the - * underlying stream to indicate to the receiver that the data was - * flushed. - */ -static int -bs2_flush(stream *ss, mnstr_flush_level flush_level) -{ - int64_t blksize; - bs2 *s; - char *writebuf; - size_t writelen; - - s = (bs2 *) ss->stream_data.p; - if (s == NULL) - return -1; - assert(!ss->readonly); - assert(s->nr < s->bufsiz); - if (!ss->readonly) { - /* flush the rest of buffer (if s->nr > 0), then set the - * last bit to 1 to to indicate user-instigated flush */ -#ifdef BSTREAM_DEBUG - if (s->nr > 0) { - size_t i; - - fprintf(stderr, "W %s %zu \"", ss->name, s->nr); - for (i = 0; i < s->nr; i++) - if (' ' <= s->buf[i] && s->buf[i] < 127) - putc(s->buf[i], stderr); - else - fprintf(stderr, "\\%03o", (unsigned char) s->buf[i]); - fprintf(stderr, "\"\n"); - fprintf(stderr, "W %s 0\n", ss->name); - } -#endif - - writelen = s->nr; - blksize = (int64_t) s->nr; - writebuf = s->buf; - - if (s->nr > 0 && s->comp != COMPRESSION_NONE) { - ssize_t compressed_length = compress_stream_data(s); - if (compressed_length < 0) { - return -1; - } - writebuf = s->compbuf; - blksize = (int64_t) compressed_length; - writelen = (size_t) compressed_length; - } - - /* indicate that this is the last buffer of a block by - * setting the low-order bit */ - blksize <<= 1; - blksize |= 1; - /* always flush (even empty blocks) needed for the protocol) */ - - if ((!mnstr_writeLng(s->s, blksize) || - (s->nr > 0 && - s->s->write(s->s, writebuf, 1, writelen) != (ssize_t) writelen))) { - mnstr_copy_error(ss, s->s); - return -1; - } - s->nr = 0; - // shouldn't we flush s->s too? - (void) flush_level; - } - return 0; -} - -/* Read buffered data and return the number of items read. At the - * flush boundary we will return 0 to indicate the end of a block. - * - * Structure field usage: - * s - the underlying stream; - * buf - not used; - * itotal - the amount of data in the current block that hasn't yet - * been read; - * nr - indicates whether the flush marker has to be returned. - */ -ssize_t -bs2_read(stream *restrict ss, void *restrict buf, size_t elmsize, size_t cnt) -{ - bs2 *s; - size_t todo = cnt * elmsize; - size_t n; - - s = (bs2 *) ss->stream_data.p; - if (s == NULL) - return -1; - assert(ss->readonly); - assert(s->nr <= 1); - - if (s->itotal == 0) { - int64_t blksize = 0; - - if (s->nr) { - /* We read the closing block but hadn't - * returned that yet. Return it now, and note - * that we did by setting s->nr to 0. */ - assert(s->nr == 1); - s->nr = 0; - return 0; - } - - assert(s->nr == 0); - - /* There is nothing more to read in the current block, - * so read the count for the next block */ - switch (mnstr_readLng(s->s, &blksize)) { - case -1: - mnstr_copy_error(ss, s->s); - return -1; - case 0: - ss->eof |= s->s->eof; - return 0; - case 1: - break; - } - if (blksize < 0) { - mnstr_set_error(ss, MNSTR_READ_ERROR, "invalid block size %" PRId64 "", blksize); - return -1; - } -#ifdef BSTREAM_DEBUG - fprintf(stderr, "R1 '%s' length: %" PRId64 ", final: %s\n", ss->name, blksize >> 1, blksize & 1 ? "true" : "false"); -#endif - s->itotal = (size_t) (blksize >> 1); /* amount readable */ - /* store whether this was the last block or not */ - s->nr = blksize & 1; - - if (s->itotal > 0) { - /* read everything into the comp buf */ - ssize_t uncompressed_length = (ssize_t) s->bufsiz; - size_t m = 0; - char *buf = s->buf; - - if (s->comp != COMPRESSION_NONE) { - buf = s->compbuf; - } - - while (m < s->itotal) { - ssize_t bytes_read = 0; - bytes_read = s->s->read(s->s, buf + m, 1, s->itotal - m); - if (bytes_read <= 0) { - ss->eof |= s->s->eof; - mnstr_copy_error(ss, s->s); - return -1; - } - m += (size_t) bytes_read; - } - if (s->comp != COMPRESSION_NONE) { - uncompressed_length = decompress_stream_data(s); - if (uncompressed_length < 0) { - if (s->s->errkind != MNSTR_NO__ERROR) - mnstr_copy_error(ss, s->s); - else - mnstr_set_error(ss, MNSTR_READ_ERROR, "uncompress failed with code %d", (int) uncompressed_length); - return -1; - } - } else { - uncompressed_length = (ssize_t) m; - } - s->itotal = (size_t) uncompressed_length; - s->readpos = 0; - } - } - - /* Fill the caller's buffer. */ - cnt = 0; /* count how much we put into the buffer */ - while (todo > 0) { - /* there is more data waiting in the current block, so - * read it */ - n = todo < s->itotal ? todo : s->itotal; - - memcpy(buf, s->buf + s->readpos, n); - buf = (void *) ((char *) buf + n); - cnt += n; - todo -= n; - s->readpos += n; - s->itotal -= n; - - if (s->itotal == 0) { - int64_t blksize = 0; - - /* The current block has been completely read, - * so read the count for the next block, only - * if the previous was not the last one */ - if (s->nr) - break; - switch (mnstr_readLng(s->s, &blksize)) { - case -1: - mnstr_copy_error(ss, s->s); - return -1; - case 0: - ss->eof |= s->s->eof; - return 0; - case 1: - break; - } - if (blksize < 0) { - mnstr_set_error(ss, MNSTR_READ_ERROR, "invalid block size %" PRId64 "", blksize); - return -1; - } -#ifdef BSTREAM_DEBUG - fprintf(stderr, "R3 '%s' length: %" PRId64 ", final: %s\n", ss->name, blksize >> 1, blksize & 1 ? "true" : "false"); -#endif - - - s->itotal = (size_t) (blksize >> 1); /* amount readable */ - /* store whether this was the last block or not */ - s->nr = blksize & 1; - - if (s->itotal > 0) { - /* read everything into the comp buf */ - ssize_t uncompressed_length = (ssize_t) s->bufsiz; - size_t m = 0; - char *buf = s->buf; - - if (s->comp != COMPRESSION_NONE) { - buf = s->compbuf; - } - - while (m < s->itotal) { - ssize_t bytes_read = 0; - bytes_read = s->s->read(s->s, buf + m, 1, s->itotal - m); - if (bytes_read <= 0) { - ss->eof |= s->s->eof; - mnstr_copy_error(ss, s->s); - return -1; - } - m += (size_t) bytes_read; - } - if (s->comp != COMPRESSION_NONE) { - uncompressed_length = decompress_stream_data(s); - if (uncompressed_length < 0) { - if (s->s->errkind != MNSTR_NO__ERROR) - mnstr_copy_error(ss, s->s); - else - mnstr_set_error(ss, MNSTR_READ_ERROR, "uncompress failed with code %d", (int) uncompressed_length); - return -1; - } - } else { - uncompressed_length = (ssize_t) m; - } - s->itotal = (size_t) uncompressed_length; - s->readpos = 0; - } - } - } - /* if we got an empty block with the end-of-sequence marker - * set (low-order bit) we must only return an empty read once, - * so we must squash the flag that we still have to return an - * empty read */ - if (todo > 0 && cnt == 0) - s->nr = 0; - return (ssize_t) (elmsize > 0 ? cnt / elmsize : 0); -} - - - -static void -bs2_resetbuf(stream *ss) -{ - bs2 *s = (bs2 *) ss->stream_data.p; - assert(ss->read == bs2_read); - s->itotal = 0; - s->nr = 0; - s->readpos = 0; -} - -int -bs2_resizebuf(stream *ss, size_t bufsiz) -{ - ssize_t compress_bound; - bs2 *s = (bs2 *) ss->stream_data.p; - assert(ss->read == bs2_read); - - if (s->buf) - free(s->buf); - if (s->compbuf) - free(s->compbuf); - - s->bufsiz = 0; - s->buf = NULL; - s->compbuf = NULL; - - if ((s->buf = malloc(bufsiz)) == NULL) { - return -1; - } - s->bufsiz = bufsiz; - compress_bound = compression_size_bound(s); - if (compress_bound > 0) { - s->compbufsiz = (size_t) compress_bound; - s->compbuf = malloc(s->compbufsiz); - if (!s->compbuf) { - free(s->buf); - s->buf = NULL; - return -1; - } - } - bs2_resetbuf(ss); - return 0; -} - -buffer -bs2_buffer(stream *ss) -{ - bs2 *s = (bs2 *) ss->stream_data.p; - buffer b; - assert(ss->read == bs2_read); - b.buf = s->buf; - b.pos = s->nr; - b.len = s->itotal; - return b; -} - -void -bs2_setpos(stream *ss, size_t pos) -{ - bs2 *s = (bs2 *) ss->stream_data.p; - assert(pos < s->bufsiz); - s->nr = pos; -} - - - - -static void -bs2_close(stream *ss) -{ - bs2 *s; - - s = (bs2 *) ss->stream_data.p; - assert(s); - if (s == NULL) - return; - if (!ss->readonly && s->nr > 0) - bs2_flush(ss, MNSTR_FLUSH_DATA); - assert(s->s); - if (s->s) - s->s->close(s->s); -} - -static void -bs2_destroy(stream *ss) -{ - bs2 *s; - - s = (bs2 *) ss->stream_data.p; - assert(s); - if (s) { - assert(s->s); - if (s->s) - s->s->destroy(s->s); - if (s->buf) - free(s->buf); - if (s->compbuf) - free(s->compbuf); - free(s); - } - destroy_stream(ss); -} - -static void -bs2_update_timeout(stream *ss) -{ - bs2 *s; - - if ((s = ss->stream_data.p) != NULL && s->s) { - s->s->timeout = ss->timeout; - s->s->timeout_func = ss->timeout_func; - s->s->timeout_data = ss->timeout_data; - if (s->s->update_timeout) - s->s->update_timeout(s->s); - } -} - -static int -bs2_isalive(const stream *ss) -{ - struct bs2 *s; - - if ((s = ss->stream_data.p) != NULL && s->s) { - if (s->s->isalive) - return s->s->isalive(s->s); - return 1; - } - return 0; -} - -stream * -block_stream2(stream *s, size_t bufsiz, compression_method comp) -{ - stream *ns; - stream *os = NULL; - bs2 *b; - - if (s == NULL) - return NULL; - if (s->read == bs_read || s->write == bs_write) { - /* if passed in a block_stream instance, extract the - * underlying stream */ - os = s; - s = s->inner; - } - -#ifdef STREAM_DEBUG - fprintf(stderr, "block_stream2 %s\n", s->name ? s->name : "<unnamed>"); -#endif - if ((ns = create_wrapper_stream(NULL, s)) == NULL) - return NULL; - if ((b = bs2_create(s, bufsiz, comp)) == NULL) { - destroy_stream(ns); - mnstr_set_open_error(s->name, 0, "bs2_create failed"); - return NULL; - } - /* blocksizes have a fixed little endian byteorder */ -#ifdef WORDS_BIGENDIAN - s->swapbytes = true; -#endif - ns->binary = s->binary; - ns->readonly = s->readonly; - ns->close = bs2_close; - ns->clrerr = bs_clrerr; - ns->destroy = bs2_destroy; - ns->flush = bs2_flush; - ns->read = bs2_read; - ns->write = bs2_write; - ns->update_timeout = bs2_update_timeout; - ns->isalive = bs2_isalive; - ns->stream_data.p = (void *) b; - - if (os != NULL) { - /* we extracted the underlying stream, destroy the old - * shell */ - os->inner = NULL; - bs_destroy(os); - } - - return ns; -}
new file mode 100644 --- /dev/null +++ b/common/stream/mapi_stream.c @@ -0,0 +1,154 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. + */ + +#include "monetdb_config.h" +#include "stream.h" +#include "stream_internal.h" +#include "mapi_prompt.h" + + +static void +discard(stream *s) +{ + static char bitbucket[8192]; + while (1) { + ssize_t nread = mnstr_read(s, bitbucket, 1, sizeof(bitbucket)); + if (nread <= 0) + return; + assert(1); + } +} + +struct mapi_recv_upload { + stream *from_client; // set to NULL after sending MAPI_PROMPT3 + stream *to_client; // set to NULL when client sends empty +}; + +static ssize_t +recv_upload_read(stream *restrict s, void *restrict buf, size_t elmsize, size_t cnt) +{ + struct mapi_recv_upload *state = s->stream_data.p; + + if (state->from_client == NULL) { + assert(s->eof); + return 0; + } + + ssize_t nread = mnstr_read(state->from_client, buf, elmsize, cnt); + if (nread != 0 || state->from_client->eof) + return nread; + + // before returning the 0 we send the prompt and make another attempt. + if ( + mnstr_write(state->to_client, PROMPT2, strlen(PROMPT2), 1) != 1 + || mnstr_flush(state->to_client, MNSTR_FLUSH_ALL) < 0 + ) { + mnstr_set_error(s, mnstr_errnr(state->to_client), "%s", mnstr_peek_error(state->to_client)); + return -1; + } + + // if it succeeds, return that to the client. + // if it's still a block boundary, return that to the client. + // if there's an error, return that to the client. + nread = mnstr_read(state->from_client, buf, elmsize, cnt); + if (nread > 0) + return nread; + if (nread == 0) { + s->eof = true; + state->from_client = NULL; + return nread; + } else { + mnstr_set_error(s, mnstr_errnr(state->from_client), "%s", mnstr_peek_error(state->from_client)); + return -1; + } +} + +static void +recv_upload_close(stream *s) +{ + struct mapi_recv_upload *state = s->stream_data.p; + + stream *from = state->from_client; + if (from) + discard(from); + + stream *to = state->to_client; + mnstr_write(to, PROMPT3, strlen(PROMPT3), 1); + mnstr_flush(to, MNSTR_FLUSH_ALL); +} + +static void +recv_upload_destroy(stream *s) +{ + struct mapi_recv_upload *state = s->stream_data.p; + free(state); + free(s); +} + + +stream* +mapi_request_upload(const char *filename, bool binary, bstream *bs, stream *ws) +{ + const char *msg = NULL; + stream *s = NULL; + struct mapi_recv_upload *state = NULL; + ssize_t nwritten; + + while (!bs->eof) + bstream_next(bs); + stream *rs = bs->s; + assert(isa_block_stream(ws)); + assert(isa_block_stream(rs)); + + if (binary) + nwritten = mnstr_printf(ws, "%srb %s\n", PROMPT3, filename); + else + nwritten = mnstr_printf(ws, "%sr 0 %s\n", PROMPT3, filename); + if (nwritten <= 0) { + msg = mnstr_peek_error(ws); + goto end; + } + if (mnstr_flush(ws, MNSTR_FLUSH_ALL) < 0) { + msg = mnstr_peek_error(ws); + goto end; + } + + char buf[256]; + if (mnstr_readline(rs, buf, sizeof(buf)) != 1 || buf[0] != '\n') { + msg = buf; + discard(rs); + goto end; + } + + // Client accepted the request + state = malloc(sizeof(*state)); + if (!state) { + msg = "malloc failed"; + goto end; + } + s = create_stream("ONCLIENT"); + if (!s) { + msg = mnstr_peek_error(NULL); + goto end; + } + state->from_client = rs; + state->to_client = ws; + s->stream_data.p = state; + s->binary= binary; + s->read = recv_upload_read; + s->close = recv_upload_close; + s->destroy = recv_upload_destroy; +end: + if (msg) { + mnstr_destroy(s); + mnstr_set_open_error(filename, 0, "ON CLIENT: %s", msg); + return NULL; + } else { + return s; + } +}
--- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -954,9 +954,7 @@ isa_block_stream(const stream *s) assert(s != NULL); return s && ((s->read == bs_read || - s->write == bs_write) || - (s->read == bs2_read || - s->write == bs2_write)); + s->write == bs_write)); }
--- a/common/stream/stream.h +++ b/common/stream/stream.h @@ -219,8 +219,6 @@ stream_export buffer *mnstr_get_buffer(s stream_export stream *block_stream(stream *s); // mapi.c, mal_mapi.c, client.c, merovingian stream_export bool isa_block_stream(const stream *s); // mapi.c, mal_client.c, remote.c, sql_scenario.c/sqlReader, sql_scan.c stream_export stream *bs_stream(stream *s); // unused -stream_export void set_prompting(stream *block_stream, const char *prompt, stream *prompt_stream); - typedef enum { PROTOCOL_AUTO = 0, // unused @@ -228,18 +226,6 @@ typedef enum { PROTOCOL_COLUMNAR = 3 // sql_result.c } protocol_version; -typedef enum { - COMPRESSION_NONE = 0, // mal_mapi.c - COMPRESSION_SNAPPY = 1, // mcrypt.c, mal_mapi.c - COMPRESSION_LZ4 = 2, // same - COMPRESSION_AUTO = 255 // never used -} compression_method; - -stream_export stream *block_stream2(stream *s, size_t bufsiz, compression_method comp); // mal_mapi.c -stream_export int bs2_resizebuf(stream *ss, size_t bufsiz); // sql_result.c -stream_export buffer bs2_buffer(stream *s); // sql_result.c -stream_export void bs2_setpos(stream *ss, size_t pos); // sql_result.c - /* read block of data including the end of block marker */ stream_export ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t elmsize, size_t cnt); @@ -276,7 +262,8 @@ stream_export stream *stream_blackhole_c stream_export stream *stream_fwf_create(stream *restrict s, size_t num_fields, size_t *restrict widths, char filler); // sql.c - stream_export stream *create_text_stream(stream *s); +stream_export stream *mapi_request_upload(const char *filename, bool binary, bstream *rs, stream *ws); + #endif /*_STREAM_H_*/
--- a/common/stream/stream_internal.h +++ b/common/stream/stream_internal.h @@ -271,8 +271,6 @@ struct bs { unsigned itotal; /* amount available in current read block */ size_t blks; /* read/writen blocks (possibly partial) */ size_t bytes; /* read/writen bytes */ - const char *prompt; /* on eof, first try to send this then try again */ - stream *pstream; /* stream to send prompts on */ char buf[BLOCK]; /* the buffered data (minus the size of * size-short */ };
--- a/sql/backends/monet5/sql.c +++ b/sql/backends/monet5/sql.c @@ -3076,7 +3076,6 @@ mvc_import_table_wrap(Client cntxt, MalB { backend *be; BAT **b = NULL; - ssize_t len = 0; sql_table *t = *(sql_table **) getArgReference(stk, pci, pci->retc + 0); const char *tsep = *getArgReference_str(stk, pci, pci->retc + 1); const char *rsep = *getArgReference_str(stk, pci, pci->retc + 2); @@ -3112,41 +3111,14 @@ mvc_import_table_wrap(Client cntxt, MalB msg = mvc_import_table(cntxt, &b, be->mvc, be->mvc->scanner.rs, t, tsep, rsep, ssep, ns, sz, offset, besteffort, true, escape); } else { if (onclient) { - mnstr_write(be->mvc->scanner.ws, PROMPT3, sizeof(PROMPT3)-1, 1); - if (offset > 1 && rsep && rsep[0] == '\n' && rsep[1] == '\0') { - /* only let client skip simple lines */ - mnstr_printf(be->mvc->scanner.ws, "r " LLFMT " %s\n", - offset, fname); - offset = 0; - } else { - mnstr_printf(be->mvc->scanner.ws, "r 0 %s\n", fname); - } - msg = MAL_SUCCEED; - mnstr_flush(be->mvc->scanner.ws, MNSTR_FLUSH_DATA); - while (!be->mvc->scanner.rs->eof) - bstream_next(be->mvc->scanner.rs); - ss = be->mvc->scanner.rs->s; - char buf[80]; - if ((len = mnstr_readline(ss, buf, sizeof(buf))) > 1) { - if (buf[0] == '!' && buf[6] == '!') - msg = createException(IO, "sql.copy_from", "%.7s%s: %s", buf, fname, buf+7); - else - msg = createException(IO, "sql.copy_from", "%s: %s", fname, buf); - while (buf[len - 1] != '\n' && - (len = mnstr_readline(ss, buf, sizeof(buf))) > 0) - ; - /* read until flush marker */ - while (mnstr_read(ss, buf, 1, sizeof(buf)) > 0) - ; - return msg; - } + ss = mapi_request_upload(fname, false, be->mvc->scanner.rs, be->mvc->scanner.ws); } else { ss = open_rastream(fname); - if (ss == NULL || mnstr_errnr(ss)) { - msg = createException(IO, "sql.copy_from", SQLSTATE(42000) "%s", mnstr_peek_error(NULL)); - close_stream(ss); - return msg; - } + } + if (ss == NULL || mnstr_errnr(ss)) { + msg = createException(IO, "sql.copy_from", SQLSTATE(42000) "%s", mnstr_peek_error(NULL)); + close_stream(ss); + return msg; } if (!strNil(fixed_widths)) { @@ -3195,12 +3167,7 @@ mvc_import_table_wrap(Client cntxt, MalB throw(MAL, "sql.copy_from", SQLSTATE(HY013) MAL_MALLOC_FAIL); } msg = mvc_import_table(cntxt, &b, be->mvc, s, t, tsep, rsep, ssep, ns, sz, offset, besteffort, false, escape); - if (onclient) { - mnstr_write(be->mvc->scanner.ws, PROMPT3, sizeof(PROMPT3)-1, 1); - mnstr_flush(be->mvc->scanner.ws, MNSTR_FLUSH_DATA); - be->mvc->scanner.rs->eof = s->eof; - s->s = NULL; - } + // This also closes ss: bstream_destroy(s); } if (b && !msg)
--- a/sql/backends/monet5/sql_bincopyfrom.c +++ b/sql/backends/monet5/sql_bincopyfrom.c @@ -543,70 +543,6 @@ load_column(struct type_rec *rec, const return msg; } - -static str -start_mapi_file_upload(backend *be, str path, stream **s) -{ - str msg = MAL_SUCCEED; - *s = NULL; - - stream *ws = be->mvc->scanner.ws; - bstream *bs = be->mvc->scanner.rs; - stream *rs = bs->s; - assert(isa_block_stream(ws)); - assert(isa_block_stream(rs)); - - mnstr_write(ws, PROMPT3, sizeof(PROMPT3)-1, 1); - mnstr_printf(ws, "rb %s\n", path); - mnstr_flush(ws, MNSTR_FLUSH_DATA); - while (!bs->eof) - bstream_next(bs); - char buf[80]; - if (mnstr_readline(rs, buf, sizeof(buf)) > 1) { - msg = createException(IO, "sql.importColumn", "Error %s", buf); - goto end; - } - set_prompting(rs, PROMPT2, ws); - - *s = rs; -end: - return msg; -} - - -static str -finish_mapi_file_upload(backend *be, bool eof_reached) -{ - str msg = MAL_SUCCEED; - stream *ws = be->mvc->scanner.ws; - bstream *bs = be->mvc->scanner.rs; - stream *rs = bs->s; - assert(isa_block_stream(ws)); - assert(isa_block_stream(rs)); - - set_prompting(rs, NULL, NULL); - if (!eof_reached) { - // Probably due to an error. Read until message boundary. - char buf[8190]; - while (1) { - ssize_t nread = mnstr_read(rs, buf, 1, sizeof(buf)); - if (nread > 0) - continue; - if (nread < 0) - msg = createException( - IO, "sql.importColumn", - "while syncing read stream: %s", mnstr_peek_error(rs)); - break; - } - } - mnstr_write(ws, PROMPT3, sizeof(PROMPT3)-1, 1); - mnstr_flush(ws, MNSTR_FLUSH_DATA); - - return msg; -} - - - /* Import a single file into a new BAT. */ static str @@ -620,7 +556,6 @@ importColumn(backend *be, bat *ret, BUN int gdk_type; BAT *bat = NULL; stream *stream_to_close = NULL; - bool do_finish_mapi = false; int eof_reached = -1; // 1 = read to the end; 0 = stopped reading early; -1 = unset, a bug. // This one is not managed by the end: block @@ -645,15 +580,13 @@ importColumn(backend *be, bat *ret, BUN // Open the input stream if (onclient) { - s = NULL; - do_finish_mapi = true; - msg = start_mapi_file_upload(be, path, &s); - if (msg != MAL_SUCCEED) - goto end; + s = stream_to_close = mapi_request_upload(path, true, be->mvc->scanner.rs, be->mvc->scanner.ws); } else { s = stream_to_close = open_rstream(path); - if (s == NULL) - bailout("Couldn't open '%s' on server: %s", path, mnstr_peek_error(NULL)); + } + if (!s) { + msg = mnstr_error(NULL); + goto end; } // Do the work @@ -667,12 +600,6 @@ importColumn(backend *be, bat *ret, BUN // Fall through into the end block which will clean things up end: - if (do_finish_mapi) { - str msg1 = finish_mapi_file_upload(be, eof_reached == 1); - if (msg == MAL_SUCCEED) - msg = msg1; - } - if (stream_to_close) close_stream(stream_to_close);