Changeset: d69f421af559 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d69f421af559
Removed Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
Branch: unlock
Log Message:
merged with default
diffs (truncated from 18619 to 300 lines):
diff --git a/clients/odbc/samples/testgetinfo.c
b/clients/odbc/samples/testgetinfo.c
--- a/clients/odbc/samples/testgetinfo.c
+++ b/clients/odbc/samples/testgetinfo.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
+#include <string.h>
/**** Define the ODBC Version this ODBC driver complies with ****/
/* also see ODBCGlobal.h */
@@ -73,6 +74,1012 @@ check(SQLRETURN ret, SQLSMALLINT tpe, SQ
return false;
}
+const struct {
+ SQLUSMALLINT info;
+ enum {
+ STRING,
+ INTEGER,
+ SHORT,
+ } type;
+ char *name;
+ union {
+ char *str;
+ SQLUSMALLINT s;
+ SQLUINTEGER i;
+ };
+} sqlinfo[] = {
+ {
+ .info = SQL_ACCESSIBLE_PROCEDURES,
+ .name = "SQL_ACCESSIBLE_PROCEDURES",
+ .type = STRING,
+ .str = "N",
+ },
+ {
+ .info = SQL_ACCESSIBLE_TABLES,
+ .name = "SQL_ACCESSIBLE_TABLES",
+ .type = STRING,
+ .str = "N",
+ },
+ {
+ .info = SQL_AGGREGATE_FUNCTIONS,
+ .name = "SQL_AGGREGATE_FUNCTIONS",
+ .type = INTEGER,
+ .i = SQL_AF_ALL | SQL_AF_AVG | SQL_AF_COUNT | SQL_AF_DISTINCT |
SQL_AF_MAX | SQL_AF_MIN | SQL_AF_SUM,
+ },
+ {
+ .info = SQL_ALTER_DOMAIN,
+ .name = "SQL_ALTER_DOMAIN",
+ .type = INTEGER,
+ .i = 0,
+ },
+ {
+ .info = SQL_ALTER_TABLE,
+ .name = "SQL_ALTER_TABLE",
+ .type = INTEGER,
+ .i = SQL_AT_ADD_COLUMN | SQL_AT_ADD_COLUMN_DEFAULT |
SQL_AT_ADD_COLUMN_SINGLE | SQL_AT_ADD_CONSTRAINT | SQL_AT_ADD_TABLE_CONSTRAINT
| SQL_AT_CONSTRAINT_NAME_DEFINITION | SQL_AT_DROP_COLUMN |
SQL_AT_DROP_COLUMN_CASCADE | SQL_AT_DROP_COLUMN_DEFAULT |
SQL_AT_DROP_COLUMN_RESTRICT | SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE |
SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT | SQL_AT_SET_COLUMN_DEFAULT,
+ },
+#ifdef SQL_ASYNC_DBC_FUNCTIONS
+ {
+ .info = SQL_ASYNC_DBC_FUNCTIONS,
+ .name = "SQL_ASYNC_DBC_FUNCTIONS",
+ .type = INTEGER,
+ .i = 0,
+ },
+#endif
+ {
+ .info = SQL_ASYNC_MODE,
+ .name = "SQL_ASYNC_MODE",
+ .type = INTEGER,
+ .i = SQL_AM_NONE,
+ },
+#ifdef SQL_ASYNC_NOTIFICATION
+ {
+ .info = SQL_ASYNC_NOTIFICATION,
+ .name = "SQL_ASYNC_NOTIFICATION",
+ .type = INTEGER,
+ .i = 0,
+ },
+#endif
+ {
+ .info = SQL_BATCH_ROW_COUNT,
+ .name = "SQL_BATCH_ROW_COUNT",
+ .type = INTEGER,
+ .i = SQL_BRC_EXPLICIT,
+ },
+ {
+ .info = SQL_BATCH_SUPPORT,
+ .name = "SQL_BATCH_SUPPORT",
+ .type = INTEGER,
+ .i = SQL_BS_SELECT_EXPLICIT | SQL_BS_ROW_COUNT_EXPLICIT,
+ },
+ {
+ .info = SQL_BOOKMARK_PERSISTENCE,
+ .name = "SQL_BOOKMARK_PERSISTENCE",
+ .type = INTEGER,
+ .i = 0,
+ },
+ {
+ .info = SQL_CATALOG_LOCATION,
+ .name = "SQL_CATALOG_LOCATION",
+ .type = SHORT,
+ .s = 0,
+ },
+ {
+ .info = SQL_CATALOG_NAME,
+ .name = "SQL_CATALOG_NAME",
+ .type = STRING,
+ .str = "N",
+ },
+ {
+ .info = SQL_CATALOG_NAME_SEPARATOR,
+ .name = "SQL_CATALOG_NAME_SEPARATOR",
+ .type = STRING,
+ .str = "",
+ },
+ {
+ .info = SQL_CATALOG_TERM,
+ .name = "SQL_CATALOG_TERM",
+ .type = STRING,
+ .str = "",
+ },
+ {
+ .info = SQL_CATALOG_USAGE,
+ .name = "SQL_CATALOG_USAGE",
+ .type = INTEGER,
+ .i = 0,
+ },
+ {
+ .info = SQL_COLLATION_SEQ,
+ .name = "SQL_COLLATION_SEQ",
+ .type = STRING,
+ .str = "UTF-8",
+ },
+ {
+ .info = SQL_COLUMN_ALIAS,
+ .name = "SQL_COLUMN_ALIAS",
+ .type = STRING,
+ .str = "Y",
+ },
+ {
+ .info = SQL_CONCAT_NULL_BEHAVIOR,
+ .name = "SQL_CONCAT_NULL_BEHAVIOR",
+ .type = SHORT,
+ .s = SQL_CB_NULL,
+ },
+ {
+ .info = SQL_CONVERT_BIGINT,
+ .name = "SQL_CONVERT_BIGINT",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BIT | SQL_CVT_CHAR |
SQL_CVT_DECIMAL | SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_YEAR_MONTH | SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_BINARY,
+ .name = "SQL_CONVERT_BINARY",
+ .type = INTEGER,
+ .i = SQL_CVT_BINARY | SQL_CVT_CHAR | SQL_CVT_LONGVARBINARY |
SQL_CVT_LONGVARCHAR | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_BIT,
+ .name = "SQL_CONVERT_BIT",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BIT | SQL_CVT_CHAR |
SQL_CVT_INTEGER | SQL_CVT_LONGVARCHAR | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_CHAR,
+ .name = "SQL_CONVERT_CHAR",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BINARY | SQL_CVT_BIT |
SQL_CVT_GUID | SQL_CVT_CHAR | SQL_CVT_DATE | SQL_CVT_DECIMAL | SQL_CVT_DOUBLE |
SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_INTERVAL_YEAR_MONTH |
SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARBINARY | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TIME |
SQL_CVT_TIMESTAMP | SQL_CVT_TINYINT | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_DATE,
+ .name = "SQL_CONVERT_DATE",
+ .type = INTEGER,
+ .i = SQL_CVT_CHAR | SQL_CVT_DATE | SQL_CVT_LONGVARCHAR |
SQL_CVT_TIMESTAMP | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_DECIMAL,
+ .name = "SQL_CONVERT_DECIMAL",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_DECIMAL |
SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_INTERVAL_DAY_TIME |
SQL_CVT_LONGVARCHAR | SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT |
SQL_CVT_TINYINT | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_DOUBLE,
+ .name = "SQL_CONVERT_DOUBLE",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_DECIMAL |
SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_FLOAT,
+ .name = "SQL_CONVERT_FLOAT",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_DECIMAL |
SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_FUNCTIONS,
+ .name = "SQL_CONVERT_FUNCTIONS",
+ .type = INTEGER,
+ .i = SQL_FN_CVT_CAST | SQL_FN_CVT_CONVERT,
+ },
+ {
+ .info = SQL_CONVERT_INTEGER,
+ .name = "SQL_CONVERT_INTEGER",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BIT | SQL_CVT_CHAR |
SQL_CVT_DECIMAL | SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_YEAR_MONTH | SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_INTERVAL_DAY_TIME,
+ .name = "SQL_CONVERT_INTERVAL_DAY_TIME",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARCHAR | SQL_CVT_SMALLINT |
SQL_CVT_TIME | SQL_CVT_TINYINT | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_INTERVAL_YEAR_MONTH,
+ .name = "SQL_CONVERT_INTERVAL_YEAR_MONTH",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_YEAR_MONTH | SQL_CVT_LONGVARCHAR | SQL_CVT_SMALLINT |
SQL_CVT_TINYINT | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_LONGVARBINARY,
+ .name = "SQL_CONVERT_LONGVARBINARY",
+ .type = INTEGER,
+ .i = SQL_CVT_BINARY | SQL_CVT_CHAR | SQL_CVT_LONGVARBINARY |
SQL_CVT_LONGVARCHAR | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_LONGVARCHAR,
+ .name = "SQL_CONVERT_LONGVARCHAR",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BINARY | SQL_CVT_BIT |
SQL_CVT_GUID | SQL_CVT_CHAR | SQL_CVT_DATE | SQL_CVT_DECIMAL | SQL_CVT_DOUBLE |
SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_INTERVAL_YEAR_MONTH |
SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARBINARY | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TIME |
SQL_CVT_TIMESTAMP | SQL_CVT_TINYINT | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_NUMERIC,
+ .name = "SQL_CONVERT_NUMERIC",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_DECIMAL |
SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_INTERVAL_DAY_TIME |
SQL_CVT_LONGVARCHAR | SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT |
SQL_CVT_TINYINT | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_REAL,
+ .name = "SQL_CONVERT_REAL",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_CHAR | SQL_CVT_DECIMAL |
SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_SMALLINT,
+ .name = "SQL_CONVERT_SMALLINT",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BIT | SQL_CVT_CHAR |
SQL_CVT_DECIMAL | SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_YEAR_MONTH | SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_TIME,
+ .name = "SQL_CONVERT_TIME",
+ .type = INTEGER,
+ .i = SQL_CVT_CHAR | SQL_CVT_INTERVAL_DAY_TIME |
SQL_CVT_LONGVARCHAR | SQL_CVT_TIME | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_TIMESTAMP,
+ .name = "SQL_CONVERT_TIMESTAMP",
+ .type = INTEGER,
+ .i = SQL_CVT_CHAR | SQL_CVT_DATE | SQL_CVT_LONGVARCHAR |
SQL_CVT_TIME | SQL_CVT_TIMESTAMP | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_TINYINT,
+ .name = "SQL_CONVERT_TINYINT",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BIT | SQL_CVT_CHAR |
SQL_CVT_DECIMAL | SQL_CVT_DOUBLE | SQL_CVT_FLOAT | SQL_CVT_INTEGER |
SQL_CVT_INTERVAL_YEAR_MONTH | SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TINYINT |
SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_VARBINARY,
+ .name = "SQL_CONVERT_VARBINARY",
+ .type = INTEGER,
+ .i = SQL_CVT_BINARY | SQL_CVT_CHAR | SQL_CVT_LONGVARBINARY |
SQL_CVT_LONGVARCHAR | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CONVERT_VARCHAR,
+ .name = "SQL_CONVERT_VARCHAR",
+ .type = INTEGER,
+ .i = SQL_CVT_BIGINT | SQL_CVT_BINARY | SQL_CVT_BIT |
SQL_CVT_GUID | SQL_CVT_CHAR | SQL_CVT_DATE | SQL_CVT_DECIMAL | SQL_CVT_DOUBLE |
SQL_CVT_FLOAT | SQL_CVT_INTEGER | SQL_CVT_INTERVAL_YEAR_MONTH |
SQL_CVT_INTERVAL_DAY_TIME | SQL_CVT_LONGVARBINARY | SQL_CVT_LONGVARCHAR |
SQL_CVT_NUMERIC | SQL_CVT_REAL | SQL_CVT_SMALLINT | SQL_CVT_TIME |
SQL_CVT_TIMESTAMP | SQL_CVT_TINYINT | SQL_CVT_VARBINARY | SQL_CVT_VARCHAR,
+ },
+ {
+ .info = SQL_CORRELATION_NAME,
+ .name = "SQL_CORRELATION_NAME",
+ .type = SHORT,
+ .s = SQL_CN_ANY,
+ },
+ {
+ .info = SQL_CREATE_ASSERTION,
+ .name = "SQL_CREATE_ASSERTION",
+ .type = INTEGER,
+ .i = 0,
+ },
+ {
+ .info = SQL_CREATE_CHARACTER_SET,
+ .name = "SQL_CREATE_CHARACTER_SET",
+ .type = INTEGER,
+ .i = 0,
+ },
+ {
+ .info = SQL_CREATE_COLLATION,
+ .name = "SQL_CREATE_COLLATION",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
