Changeset: b5f3a160e125 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5f3a160e125
Modified Files:
clients/odbc/driver/SQLGetStmtAttr.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/samples/testgetinfo.c
sql/odbc/samples/Tests/testgetinfo.stable.err
sql/odbc/samples/Tests/testgetinfo.stable.out
Branch: Apr2019
Log Message:
Use same version of ODBC in test as in driver.
diffs (63 lines):
diff --git a/clients/odbc/driver/SQLGetStmtAttr.c
b/clients/odbc/driver/SQLGetStmtAttr.c
--- a/clients/odbc/driver/SQLGetStmtAttr.c
+++ b/clients/odbc/driver/SQLGetStmtAttr.c
@@ -164,7 +164,7 @@ MNDBGetStmtAttr(ODBCStmt *stmt,
/* TODO: implement requested behavior */
#ifdef SQL_ATTR_ASYNC_STMT_EVENT
- case SQL_ATTR_ASYNC_EVENT: /* SQLPOINTER */
+ case SQL_ATTR_ASYNC_STMT_EVENT: /* SQLPOINTER */
#endif
#ifdef SQL_ATTR_ASYNC_STMT_PCALLBACK
case SQL_ATTR_ASYNC_PCALLBACK: /* SQLPOINTER */
diff --git a/clients/odbc/driver/SQLSetStmtAttr.c
b/clients/odbc/driver/SQLSetStmtAttr.c
--- a/clients/odbc/driver/SQLSetStmtAttr.c
+++ b/clients/odbc/driver/SQLSetStmtAttr.c
@@ -277,7 +277,7 @@ MNDBSetStmtAttr(ODBCStmt *stmt,
/* TODO: implement requested behavior */
case SQL_ATTR_ASYNC_ENABLE: /* SQLULEN */
#ifdef SQL_ATTR_ASYNC_STMT_EVENT
- case SQL_ATTR_ASYNC_EVENT: /* SQLPOINTER */
+ case SQL_ATTR_ASYNC_STMT_EVENT: /* SQLPOINTER */
#endif
#ifdef SQL_ATTR_ASYNC_STMT_PCALLBACK
case SQL_ATTR_ASYNC_PCALLBACK: /* SQLPOINTER */
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,11 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
+
+/**** Define the ODBC Version this ODBC driver complies with ****/
+/* also see ODBCGlobal.h */
+#define ODBCVER 0x0352 /* Important: this must be defined before
include of sqlext.h */
+
#include <sql.h>
#include <sqlext.h>
diff --git a/sql/odbc/samples/Tests/testgetinfo.stable.err
b/sql/odbc/samples/Tests/testgetinfo.stable.err
--- a/sql/odbc/samples/Tests/testgetinfo.stable.err
+++ b/sql/odbc/samples/Tests/testgetinfo.stable.err
@@ -31,8 +31,6 @@ stderr of test 'testgetinfo` in director
# 00:56:17 > testgetinfo MonetDB-Test
# 00:56:17 >
-SQLGetInfo SQL_ASYNC_DBC_FUNCTIONS: Error: SQLstate HY096, Errnr 0, Message
[MonetDB][ODBC Driver 11.33.0]Information type out of range
-SQLGetInfo SQL_ASYNC_NOTIFICATION: Error: SQLstate HY096, Errnr 0, Message
[MonetDB][ODBC Driver 11.33.0]Information type out of range
# 00:56:17 >
# 00:56:17 > "Done."
diff --git a/sql/odbc/samples/Tests/testgetinfo.stable.out
b/sql/odbc/samples/Tests/testgetinfo.stable.out
--- a/sql/odbc/samples/Tests/testgetinfo.stable.out
+++ b/sql/odbc/samples/Tests/testgetinfo.stable.out
@@ -87,7 +87,7 @@ SQL_DM_VER: 03.52.0002.0003
SQL_DRIVER_AWARE_POOLING_SUPPORTED: 0
SQL_DRIVER_NAME: MonetDBODBClib
SQL_DRIVER_ODBC_VER: 03.52
-#SQL_DRIVER_VER: 11.33.0000 unreleased
+#SQL_DRIVER_VER: 11.33.0002 unreleased
SQL_DROP_ASSERTION:
SQL_DROP_CHARACTER_SET:
SQL_DROP_COLLATION:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
