Changeset: 518c2e735b51 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=518c2e735b51
Modified Files:
        clients/odbc/samples/testgetinfo.c
        sql/odbc/samples/Tests/testgetinfo.stable.err
        sql/odbc/samples/Tests/testgetinfo.stable.out
Branch: Apr2019
Log Message:

Use symbolic names in the test.


diffs (truncated from 3586 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
@@ -81,7 +81,7 @@ main(int argc, char **argv)
        SQLRETURN ret;
        char str[2048];
        SQLSMALLINT resultlen;
-       SQLUSMALLINT si;
+       SQLUSMALLINT s;
        SQLUINTEGER i;
 
        if (argc > 1)
@@ -110,619 +110,2927 @@ main(int argc, char **argv)
        check(ret, SQL_HANDLE_DBC, dbc, "SQLConnect");
 
        ret = SQLGetInfo(dbc, SQL_ACCESSIBLE_PROCEDURES, str, sizeof(str), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ACCESSIBLE_PROCEDURES");
        printf("SQL_ACCESSIBLE_PROCEDURES: %.*s\n", resultlen, str);
 
        ret = SQLGetInfo(dbc, SQL_ACCESSIBLE_TABLES, str, sizeof(str), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ACCESSIBLE_TABLES");
        printf("SQL_ACCESSIBLE_TABLES: %.*s\n", resultlen, str);
 
-       ret = SQLGetInfo(dbc, SQL_ACTIVE_ENVIRONMENTS, &si, sizeof(si), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_ACTIVE_ENVIRONMENTS: %u\n", (unsigned int) si);
+       ret = SQLGetInfo(dbc, SQL_ACTIVE_ENVIRONMENTS, &s, sizeof(s), 
&resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ACTIVE_ENVIRONMENTS");
 
        ret = SQLGetInfo(dbc, SQL_AGGREGATE_FUNCTIONS, &i, sizeof(i), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_AGGREGATE_FUNCTIONS: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_AGGREGATE_FUNCTIONS");
+       printf("SQL_AGGREGATE_FUNCTIONS:");
+       if (i & SQL_AF_ALL)
+               printf(" SQL_AF_ALL");
+       if (i & SQL_AF_AVG)
+               printf(" SQL_AF_AVG");
+       if (i & SQL_AF_COUNT)
+               printf(" SQL_AF_COUNT");
+       if (i & SQL_AF_DISTINCT)
+               printf(" SQL_AF_DISTINCT");
+       if (i & SQL_AF_MAX)
+               printf(" SQL_AF_MAX");
+       if (i & SQL_AF_MIN)
+               printf(" SQL_AF_MIN");
+       if (i & SQL_AF_SUM)
+               printf(" SQL_AF_SUM");
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_ALTER_DOMAIN, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_ALTER_DOMAIN: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ALTER_DOMAIN");
+       printf("SQL_ALTER_DOMAIN:");
+       if (i & SQL_AD_ADD_DOMAIN_CONSTRAINT)
+               printf(" SQL_AD_ADD_DOMAIN_CONSTRAINT");
+       if (i & SQL_AD_ADD_DOMAIN_DEFAULT)
+               printf(" SQL_AD_ADD_DOMAIN_DEFAULT");
+       if (i & SQL_AD_CONSTRAINT_NAME_DEFINITION)
+               printf(" SQL_AD_CONSTRAINT_NAME_DEFINITION");
+       if (i & SQL_AD_DROP_DOMAIN_CONSTRAINT)
+               printf(" SQL_AD_DROP_DOMAIN_CONSTRAINT");
+       if (i & SQL_AD_DROP_DOMAIN_DEFAULT)
+               printf(" SQL_AD_DROP_DOMAIN_DEFAULT");
+       if (i & SQL_AD_ADD_CONSTRAINT_DEFERRABLE)
+               printf(" SQL_AD_ADD_CONSTRAINT_DEFERRABLE");
+       if (i & SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE)
+               printf(" SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE");
+       if (i & SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED)
+               printf(" SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED");
+       if (i & SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE)
+               printf(" SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE");
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_ALTER_TABLE, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_ALTER_TABLE: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ALTER_TABLE");
+       printf("SQL_ALTER_TABLE:");
+       if (i & SQL_AT_ADD_COLUMN_COLLATION)
+               printf(" SQL_AT_ADD_COLUMN_COLLATION");
+       if (i & SQL_AT_ADD_COLUMN_DEFAULT)
+               printf(" SQL_AT_ADD_COLUMN_DEFAULT");
+       if (i & SQL_AT_ADD_COLUMN_SINGLE)
+               printf(" SQL_AT_ADD_COLUMN_SINGLE");
+       if (i & SQL_AT_ADD_CONSTRAINT)
+               printf(" SQL_AT_ADD_CONSTRAINT");
+       if (i & SQL_AT_ADD_TABLE_CONSTRAINT)
+               printf(" SQL_AT_ADD_TABLE_CONSTRAINT");
+       if (i & SQL_AT_CONSTRAINT_NAME_DEFINITION)
+               printf(" SQL_AT_CONSTRAINT_NAME_DEFINITION");
+       if (i & SQL_AT_DROP_COLUMN_CASCADE)
+               printf(" SQL_AT_DROP_COLUMN_CASCADE");
+       if (i & SQL_AT_DROP_COLUMN_DEFAULT)
+               printf(" SQL_AT_DROP_COLUMN_DEFAULT");
+       if (i & SQL_AT_DROP_COLUMN_RESTRICT)
+               printf(" SQL_AT_DROP_COLUMN_RESTRICT");
+       if (i & SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE)
+               printf(" SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE");
+       if (i & SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT)
+               printf(" SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT");
+       if (i & SQL_AT_SET_COLUMN_DEFAULT)
+               printf(" SQL_AT_SET_COLUMN_DEFAULT");
+       if (i & SQL_AT_CONSTRAINT_INITIALLY_DEFERRED)
+               printf(" SQL_AT_CONSTRAINT_INITIALLY_DEFERRED");
+       if (i & SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE)
+               printf(" SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE");
+       if (i & SQL_AT_CONSTRAINT_DEFERRABLE)
+               printf(" SQL_AT_CONSTRAINT_DEFERRABLE");
+       if (i & SQL_AT_CONSTRAINT_NON_DEFERRABLE)
+               printf(" SQL_AT_CONSTRAINT_NON_DEFERRABLE");
+       printf("\n");
+
+#ifdef SQL_ASYNC_DBC_FUNCTIONS
+       ret = SQLGetInfo(dbc, SQL_ASYNC_DBC_FUNCTIONS, &i, sizeof(i), 
&resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ASYNC_DBC_FUNCTIONS");
+       printf("SQL_ASYNC_DBC_FUNCTIONS:");
+       if (i & SQL_ASYNC_DBC_CAPABLE)
+               printf(" SQL_ASYNC_DBC_CAPABLE");
+       if (i & SQL_ASYNC_DBC_NOT_CAPABLE)
+               printf(" SQL_ASYNC_DBC_NOT_CAPABLE");
+       printf("\n");
+#endif
 
        ret = SQLGetInfo(dbc, SQL_ASYNC_MODE, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_ASYNC_MODE: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ASYNC_MODE");
+       printf("SQL_ASYNC_MODE:");
+       if (i & SQL_AM_CONNECTION)
+               printf(" SQL_AM_CONNECTION");
+       if (i & SQL_AM_STATEMENT)
+               printf(" SQL_AM_STATEMENT");
+       if (i & SQL_AM_NONE)
+               printf(" SQL_AM_NONE");
+       printf("\n");
+
+#ifdef SQL_ASYNC_NOTIFICATION
+       ret = SQLGetInfo(dbc, SQL_ASYNC_NOTIFICATION, &i, sizeof(i), 
&resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_ASYNC_NOTIFICATION");
+       printf("SQL_ASYNC_NOTIFICATION:");
+       if (i & SQL_ASYNC_NOTIFICATION_CAPABLE)
+               printf(" SQL_ASYNC_NOTIFICATION_CAPABLE");
+       if (i & SQL_ASYNC_NOTIFICATION_NOT_CAPABLE)
+               printf(" SQL_ASYNC_NOTIFICATION_NOT_CAPABLE");
+       printf("\n");
+#endif
 
        ret = SQLGetInfo(dbc, SQL_BATCH_ROW_COUNT, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_BATCH_ROW_COUNT: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_BATCH_ROW_COUNT");
+       printf("SQL_BATCH_ROW_COUNT:");
+       if (i & SQL_BRC_ROLLED_UP)
+               printf(" SQL_BRC_ROLLED_UP");
+       if (i & SQL_BRC_PROCEDURES)
+               printf(" SQL_BRC_PROCEDURES");
+       if (i & SQL_BRC_EXPLICIT)
+               printf(" SQL_BRC_EXPLICIT");
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_BATCH_SUPPORT, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_BATCH_SUPPORT: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_BATCH_SUPPORT");
+       printf("SQL_BATCH_SUPPORT:");
+       if (i & SQL_BS_SELECT_EXPLICIT)
+               printf(" SQL_BS_SELECT_EXPLICIT");
+       if (i & SQL_BS_ROW_COUNT_EXPLICIT)
+               printf(" SQL_BS_ROW_COUNT_EXPLICIT");
+       if (i & SQL_BS_SELECT_PROC)
+               printf(" SQL_BS_SELECT_PROC");
+       if (i & SQL_BS_ROW_COUNT_PROC)
+               printf(" SQL_BS_ROW_COUNT_PROC");
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_BOOKMARK_PERSISTENCE, &i, sizeof(i), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_BOOKMARK_PERSISTENCE: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_BOOKMARK_PERSISTENCE");
+       printf("SQL_BOOKMARK_PERSISTENCE:");
+       if (i & SQL_BP_CLOSE)
+               printf(" SQL_BP_CLOSE");
+       if (i & SQL_BP_DELETE)
+               printf(" SQL_BP_DELETE");
+       if (i & SQL_BP_DROP)
+               printf(" SQL_BP_DROP");
+       if (i & SQL_BP_TRANSACTION)
+               printf(" SQL_BP_TRANSACTION");
+       if (i & SQL_BP_UPDATE)
+               printf(" SQL_BP_UPDATE");
+       if (i & SQL_BP_OTHER_HSTMT)
+               printf(" SQL_BP_OTHER_HSTMT");
+       printf("\n");
 
-       ret = SQLGetInfo(dbc, SQL_CATALOG_LOCATION, &si, sizeof(si), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_CATALOG_LOCATION: 0x%x\n", (unsigned int) si);
+       ret = SQLGetInfo(dbc, SQL_CATALOG_LOCATION, &s, sizeof(s), &resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CATALOG_LOCATION");
+       printf("SQL_CATALOG_LOCATION: ");
+       switch (s) {
+       case SQL_CL_START:
+               printf("SQL_CL_START");
+               break;
+       case SQL_CL_END:
+               printf("SQL_CL_END");
+               break;
+       }
+       printf("\n");
+
+       ret = SQLGetInfo(dbc, SQL_CATALOG_NAME, str, sizeof(str), &resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CATALOG_NAME");
+       printf("SQL_CATALOG_NAME: %.*s\n", resultlen, str);
 
        ret = SQLGetInfo(dbc, SQL_CATALOG_NAME_SEPARATOR, str, sizeof(str), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo 
SQL_CATALOG_NAME_SEPARATOR");
        printf("SQL_CATALOG_NAME_SEPARATOR: %.*s\n", resultlen, str);
 
-       ret = SQLGetInfo(dbc, SQL_CATALOG_NAME, str, sizeof(str), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_CATALOG_NAME: %.*s\n", resultlen, str);
-
        ret = SQLGetInfo(dbc, SQL_CATALOG_TERM, str, sizeof(str), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CATALOG_TERM");
        printf("SQL_CATALOG_TERM: %.*s\n", resultlen, str);
 
        ret = SQLGetInfo(dbc, SQL_CATALOG_USAGE, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_CATALOG_USAGE: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CATALOG_USAGE");
+       printf("SQL_CATALOG_USAGE:");
+       if (i & SQL_CU_DML_STATEMENTS)
+               printf(" SQL_CU_DML_STATEMENTS");
+       if (i & SQL_CU_PROCEDURE_INVOCATION)
+               printf(" SQL_CU_PROCEDURE_INVOCATION");
+       if (i & SQL_CU_TABLE_DEFINITION)
+               printf(" SQL_CU_TABLE_DEFINITION");
+       if (i & SQL_CU_INDEX_DEFINITION)
+               printf(" SQL_CU_INDEX_DEFINITION");
+       if (i & SQL_CU_PRIVILEGE_DEFINITION)
+               printf(" SQL_CU_PRIVILEGE_DEFINITION");
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_COLLATION_SEQ, str, sizeof(str), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_COLLATION_SEQ");
        printf("SQL_COLLATION_SEQ: %.*s\n", resultlen, str);
 
        ret = SQLGetInfo(dbc, SQL_COLUMN_ALIAS, str, sizeof(str), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_COLUMN_ALIAS");
        printf("SQL_COLUMN_ALIAS: %.*s\n", resultlen, str);
 
-       ret = SQLGetInfo(dbc, SQL_CONCAT_NULL_BEHAVIOR, &si, sizeof(si), 
&resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_CONCAT_NULL_BEHAVIOR: 0x%x\n", (unsigned int) si);
+       ret = SQLGetInfo(dbc, SQL_CONCAT_NULL_BEHAVIOR, &s, sizeof(s), 
&resultlen);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CONCAT_NULL_BEHAVIOR");
+       printf("SQL_CONCAT_NULL_BEHAVIOR: ");
+       switch (s) {
+       case SQL_CB_NULL:
+               printf("SQL_CB_NULL");
+               break;
+       case SQL_CB_NON_NULL:
+               printf("SQL_CB_NON_NULL");
+               break;
+       }
+       printf("\n");
 
        ret = SQLGetInfo(dbc, SQL_CONVERT_BIGINT, &i, sizeof(i), &resultlen);
-       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo");
-       printf("SQL_CONVERT_BIGINT: 0x%x\n", (unsigned int) i);
+       check(ret, SQL_HANDLE_DBC, dbc, "SQLGetInfo SQL_CONVERT_BIGINT");
+       printf("SQL_CONVERT_BIGINT:");
+       if (i & SQL_CVT_BIGINT)
+               printf(" SQL_CVT_BIGINT");
+       if (i & SQL_CVT_BINARY)
+               printf(" SQL_CVT_BINARY");
+       if (i & SQL_CVT_BIT)
+               printf(" SQL_CVT_BIT");
+       if (i & SQL_CVT_GUID)
+               printf(" SQL_CVT_GUID");
+       if (i & SQL_CVT_CHAR)
+               printf(" SQL_CVT_CHAR");
+       if (i & SQL_CVT_DATE)
+               printf(" SQL_CVT_DATE");
+       if (i & SQL_CVT_DECIMAL)
+               printf(" SQL_CVT_DECIMAL");
+       if (i & SQL_CVT_DOUBLE)
+               printf(" SQL_CVT_DOUBLE");
+       if (i & SQL_CVT_FLOAT)
+               printf(" SQL_CVT_FLOAT");
+       if (i & SQL_CVT_INTEGER)
+               printf(" SQL_CVT_INTEGER");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to