Connector/ODBC 3.51 commit: r800 - trunk/test

[jwinstead]

Modified:
   trunk/test/my_datetime.c
   trunk/test/my_info.c
Log:
Fix failing (incorrect) tests


Modified: trunk/test/my_datetime.c
===================================================================
--- trunk/test/my_datetime.c	2007-10-01 13:04:38 UTC (rev 799)
+++ trunk/test/my_datetime.c	2007-10-02 19:32:38 UTC (rev 800)
@@ -899,6 +899,7 @@
 {
   SQLCHAR data[20];
   SQLSMALLINT len;
+  SQLLEN dlen;
 
   ok_sql(hstmt, "SELECT CAST('2007-01-13' AS DATE) AS col1");
 
@@ -914,8 +915,8 @@
 
   ok_stmt(hstmt, SQLFetch(hstmt));
 
-  ok_stmt(hstmt, SQLGetData(hstmt, 1, SQL_C_CHAR, data, sizeof(data), &len));
-  is_num(len, 10);
+  ok_stmt(hstmt, SQLGetData(hstmt, 1, SQL_C_CHAR, data, sizeof(data), &dlen));
+  is_num(dlen, 10);
   is_str(data, "2007-01-13", 11);
 
   expect_stmt(hstmt, SQLFetch(hstmt), SQL_NO_DATA_FOUND);

Modified: trunk/test/my_info.c
===================================================================
--- trunk/test/my_info.c	2007-10-01 13:04:38 UTC (rev 799)
+++ trunk/test/my_info.c	2007-10-02 19:32:38 UTC (rev 800)
@@ -139,10 +139,8 @@
    for SQL_DATETIME to SQL_TYPE_DATE, which means our little workaround to
    get all of the SQL_DATETIME types at once does not work on there.
   */
-  skip("test doesn't work on with Microsoft Windows ODBC driver manager");
+  skip("test doesn't work with Microsoft Windows ODBC driver manager");
 #else
-  SQLSMALLINT pccol;
-
   ok_stmt(hstmt, SQLGetTypeInfo(hstmt, SQL_DATETIME));
 
   is(myresult(hstmt) > 1);
@@ -197,8 +195,7 @@
 
   memset(funcs, 0xff, sizeof(SQLUSMALLINT) * SQL_API_ODBC3_ALL_FUNCTIONS_SIZE);
 
-  ok_stmt(hstmt, SQLGetFunctions(hstmt, SQL_API_ODBC3_ALL_FUNCTIONS,
-                                 funcs));
+  ok_con(hdbc, SQLGetFunctions(hdbc, SQL_API_ODBC3_ALL_FUNCTIONS, funcs));
 
   is(!SQL_FUNC_EXISTS(funcs, SQL_API_SQLALLOCHANDLESTD));