Changeset: 51a2d11fa330 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/51a2d11fa330
Added Files:
clients/odbc/tests/ODBCgetInfo.c
clients/odbc/tests/ODBCmetadata.c
sql/odbc/tests/Tests/ODBCgetInfo.SQL.bat
sql/odbc/tests/Tests/ODBCgetInfo.SQL.sh
sql/odbc/tests/Tests/ODBCmetadata.SQL.bat
sql/odbc/tests/Tests/ODBCmetadata.SQL.sh
sql/odbc/tests/Tests/SingleServer
Removed Files:
clients/odbc/samples/metadata.c
clients/odbc/samples/testgetinfo.c
sql/odbc/samples/Tests/metadata.SQL.bat
sql/odbc/samples/Tests/metadata.SQL.sh
sql/odbc/samples/Tests/testgetinfo.SQL.bat
sql/odbc/samples/Tests/testgetinfo.SQL.sh
Modified Files:
clients/odbc/samples/CMakeLists.txt
clients/odbc/tests/CMakeLists.txt
sql/odbc/samples/Tests/All
sql/odbc/tests/Tests/All
sql/odbc/tests/Tests/ODBCStmtAttr.SQL.bat
Branch: default
Log Message:
Moving ODBC test programs from samples directory to tests directory.
Also add prefix ODBC to the program names as they will end up in the
$INSTALL/bin directory.
diffs (truncated from 937 to 300 lines):
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -16,12 +16,6 @@ if(TESTING)
PRIVATE
ODBC::ODBC)
- add_executable(testgetinfo
- testgetinfo.c)
- target_link_libraries(testgetinfo
- PRIVATE
- ODBC::ODBC)
-
add_executable(arraytest
arraytest.c)
@@ -29,18 +23,9 @@ if(TESTING)
PRIVATE
ODBC::ODBC)
- add_executable(metadata
- metadata.c)
-
- target_link_libraries(metadata
- PRIVATE
- ODBC::ODBC)
-
install(TARGETS
odbcsample1
- testgetinfo
arraytest
- metadata
RUNTIME
DESTINATION
${CMAKE_INSTALL_BINDIR}
@@ -49,9 +34,7 @@ if(TESTING)
if(WIN32)
install(FILES
$<TARGET_PDB_FILE:odbcsample1>
- $<TARGET_PDB_FILE:testgetinfo>
$<TARGET_PDB_FILE:arraytest>
- $<TARGET_PDB_FILE:metadata>
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
diff --git a/clients/odbc/tests/CMakeLists.txt
b/clients/odbc/tests/CMakeLists.txt
--- a/clients/odbc/tests/CMakeLists.txt
+++ b/clients/odbc/tests/CMakeLists.txt
@@ -9,6 +9,12 @@
include_directories($<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>)
if(TESTING)
+ add_executable(ODBCgetInfo
+ ODBCgetInfo.c)
+ target_link_libraries(ODBCgetInfo
+ PRIVATE
+ ODBC::ODBC)
+
add_executable(ODBCStmtAttr
ODBCStmtAttr.c)
@@ -16,8 +22,17 @@ if(TESTING)
PRIVATE
ODBC::ODBC)
+ add_executable(ODBCmetadata
+ ODBCmetadata.c)
+
+ target_link_libraries(ODBCmetadata
+ PRIVATE
+ ODBC::ODBC)
+
install(TARGETS
+ ODBCgetInfo
ODBCStmtAttr
+ ODBCmetadata
RUNTIME
DESTINATION
${CMAKE_INSTALL_BINDIR}
@@ -25,7 +40,9 @@ if(TESTING)
if(WIN32)
install(FILES
+ $<TARGET_PDB_FILE:ODBCgetInfo>
$<TARGET_PDB_FILE:ODBCStmtAttr>
+ $<TARGET_PDB_FILE:ODBCmetadata>
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
diff --git a/clients/odbc/samples/testgetinfo.c
b/clients/odbc/tests/ODBCgetInfo.c
rename from clients/odbc/samples/testgetinfo.c
rename to clients/odbc/tests/ODBCgetInfo.c
--- a/clients/odbc/samples/testgetinfo.c
+++ b/clients/odbc/tests/ODBCgetInfo.c
@@ -428,7 +428,7 @@ const struct {
.info = SQL_DATABASE_NAME,
.name = "SQL_DATABASE_NAME",
.type = STRING,
- .str = "mTests_sql_odbc_samples",
+ .str = "mTests_sql_odbc_tests",
},
{
.info = SQL_DATETIME_LITERALS,
diff --git a/clients/odbc/samples/metadata.c b/clients/odbc/tests/ODBCmetadata.c
rename from clients/odbc/samples/metadata.c
rename to clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/samples/metadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -275,7 +275,7 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLTables (SQL_ALL_CATALOGS)",
"Resultset with 5 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE
REMARKS\n"
- "mTests_sql_odbc_samples NULL NULL NULL
NULL\n");
+ "mTests_sql_odbc_tests NULL NULL NULL NULL\n");
// All schemas query
ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -318,13 +318,13 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLTables (odbctst, %)",
"Resultset with 5 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE
REMARKS\n"
- "mTests_sql_odbc_samples odbctst CUSTOMERS TABLE
NULL\n"
- "mTests_sql_odbc_samples odbctst LINES TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst ORDERS TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst fk2c TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst nopk_twoucs TABLE
NULL\n"
- "mTests_sql_odbc_samples odbctst pk2c TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc 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");
// All user tables and views
ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -333,17 +333,17 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLTables (%, %, TABLE, VIEW, GLOBAL
TEMPORARY TABLE, LOCAL TEMPORARY TABLE)",
"Resultset with 5 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE
REMARKS\n"
- "mTests_sql_odbc_samples tmp glbl_nopk_twoucs
GLOBAL TEMPORARY TABLE NULL\n"
- "mTests_sql_odbc_samples tmp glbl_pk_uc GLOBAL
TEMPORARY TABLE NULL\n"
- "mTests_sql_odbc_samples tmp tmp_nopk_twoucs LOCAL
TEMPORARY TABLE NULL\n"
- "mTests_sql_odbc_samples tmp tmp_pk_uc LOCAL
TEMPORARY TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst CUSTOMERS TABLE
NULL\n"
- "mTests_sql_odbc_samples odbctst LINES TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst ORDERS TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst fk2c TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst nopk_twoucs TABLE
NULL\n"
- "mTests_sql_odbc_samples odbctst pk2c TABLE NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc TABLE
NULL\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");
// All columns of odbctst tables containg 'pk' in their name
ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -352,13 +352,13 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLColumns (odbctst, %pk%, %)",
"Resultset with 18 columns\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"
- "mTests_sql_odbc_samples odbctst nopk_twoucs id2
4 INTEGER 32 11 0 2 0 NULL NULL 4
NULL NULL 1 NO\n"
- "mTests_sql_odbc_samples odbctst nopk_twoucs name2
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\n"
- "mTests_sql_odbc_samples odbctst pk2c pkc1 4
INTEGER 32 11 0 2 0 NULL NULL 4 NULL
NULL 1 NO\n"
- "mTests_sql_odbc_samples odbctst pk2c pkc2 -9
VARCHAR 99 198 NULL NULL 0 NULL NULL -9 NULL
198 2 NO\n"
- "mTests_sql_odbc_samples odbctst pk2c name1 -9
VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL
198 3 YES\n"
- "mTests_sql_odbc_samples odbctst pk_uc id1 4
INTEGER 32 11 0 2 0 NULL NULL 4 NULL
NULL 1 NO\n"
- "mTests_sql_odbc_samples odbctst pk_uc name1 -9
VARCHAR 99 198 NULL NULL 1 NULL NULL -9 NULL
198 2 YES\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");
// All columns of all tmp tables containg 'pk' in their name
ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -367,14 +367,14 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLColumns (tmp, %pk%, %%)",
"Resultset with 18 columns\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"
- "mTests_sql_odbc_samples tmp glbl_nopk_twoucs
id2 4 INTEGER 32 11 0 2 0 NULL NULL
4 NULL NULL 1 NO\n"
- "mTests_sql_odbc_samples tmp glbl_nopk_twoucs
name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL
-9 NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp glbl_pk_uc id1
4 INTEGER 32 11 0 2 0 NULL NULL 4
NULL NULL 1 NO\n"
- "mTests_sql_odbc_samples tmp glbl_pk_uc name1
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp tmp_nopk_twoucs id2
4 INTEGER 32 11 0 2 0 NULL NULL 4
NULL NULL 1 NO\n"
- "mTests_sql_odbc_samples tmp tmp_nopk_twoucs name2
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp tmp_pk_uc id1
4 INTEGER 32 11 0 2 0 NULL NULL 4
NULL NULL 1 NO\n"
- "mTests_sql_odbc_samples tmp tmp_pk_uc name1
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\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");
// All columns of all tmp tables containg 'pk' in their name and the
column matching name_ pattern
ret = SQLColumns(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -383,10 +383,10 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLColumns (tmp, %pk%, name_)",
"Resultset with 18 columns\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"
- "mTests_sql_odbc_samples tmp glbl_nopk_twoucs
name2 -9 VARCHAR 99 198 NULL NULL 1 NULL NULL
-9 NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp glbl_pk_uc name1
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp tmp_nopk_twoucs name2
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\n"
- "mTests_sql_odbc_samples tmp tmp_pk_uc name1
-9 VARCHAR 99 198 NULL NULL 1 NULL NULL -9
NULL 198 2 YES\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");
// sys.table_types
ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -394,7 +394,7 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLPrimaryKeys (sys, table_types)",
"Resultset with 6 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
KEY_SEQ PK_NAME\n"
- "mTests_sql_odbc_samples sys table_types
table_type_id 1 table_types_table_type_id_pkey\n");
+ "mTests_sql_odbc_tests 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,
@@ -410,8 +410,8 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLStatistics (sys, table_types,
SQL_INDEX_UNIQUE, SQL_ENSURE)",
"Resultset with 13 columns\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"
- "mTests_sql_odbc_samples sys table_types 0
NULL table_types_table_type_id_pkey 2 1 table_type_id NULL
10 NULL NULL\n"
- "mTests_sql_odbc_samples sys table_types 0
NULL table_types_table_type_name_unique 2 1 table_type_name
NULL 10 NULL NULL\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");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types",
SQL_NTS,
@@ -419,8 +419,8 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLStatistics (sys, table_types,
SQL_INDEX_ALL, SQL_QUICK)",
"Resultset with 13 columns\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"
- "mTests_sql_odbc_samples sys table_types 0
NULL table_types_table_type_id_pkey 2 1 table_type_id NULL
10 NULL NULL\n"
- "mTests_sql_odbc_samples sys table_types 0
NULL table_types_table_type_name_unique 2 1 table_type_name
NULL 10 NULL NULL\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");
ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types",
SQL_NTS);
@@ -441,7 +441,7 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLPrimaryKeys (odbctst, pk_uc)",
"Resultset with 6 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
KEY_SEQ PK_NAME\n"
- "mTests_sql_odbc_samples odbctst pk_uc id1 1
pk_uc_id1_pkey\n");
+ "mTests_sql_odbc_tests 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,
@@ -464,8 +464,8 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLStatistics (odbctst, pk_uc,
SQL_INDEX_UNIQUE, SQL_ENSURE)",
"Resultset with 13 columns\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"
- "mTests_sql_odbc_samples odbctst pk_uc 0 NULL
pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc 0 NULL
pk_uc_name1_unique 2 1 name1 NULL 0 NULL
NULL\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");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc",
SQL_NTS,
@@ -473,20 +473,20 @@ main(int argc, char **argv)
compareResult(stmt, ret, "SQLStatistics (odbctst, pk_uc, SQL_INDEX_ALL,
SQL_QUICK)",
"Resultset with 13 columns\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"
- "mTests_sql_odbc_samples odbctst pk_uc 0 NULL
pk_uc_id1_pkey 2 1 id1 NULL 0 NULL NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc 0 NULL
pk_uc_name1_unique 2 1 name1 NULL 0 NULL NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc 1 NULL
pk_uc_i 2 1 id1 NULL NULL NULL NULL\n"
- "mTests_sql_odbc_samples odbctst pk_uc 1 NULL
pk_uc_i 2 2 name1 NULL NULL NULL NULL\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");
ret = SQLTablePrivileges(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc",
SQL_NTS);
compareResult(stmt, ret, "SQLTablePrivileges (odbctst, pk_uc)",
"Resultset with 7 columns\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "mTests_sql_odbc_samples odbctst pk_uc _SYSTEM monetdb
DELETE NO\n"
- "mTests_sql_odbc_samples odbctst pk_uc _SYSTEM monetdb
INSERT NO\n"
- "mTests_sql_odbc_samples odbctst pk_uc monetdb PUBLIC
SELECT NO\n"
- "mTests_sql_odbc_samples odbctst pk_uc _SYSTEM monetdb
UPDATE NO\n");
+ "mTests_sql_odbc_tests odbctst pk_uc _SYSTEM monetdb DELETE
NO\n"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
