ODBC C-tests commit: r138 - trunk/testsuites/t_unixodbc_sap

[uwendel]

Modified:
   trunk/testsuites/t_unixodbc_sap/sap_colattrb.c
Log:
So much about this unixODBC test. No new issues. One fine day we should test all the other
MySQL data types as well.



Modified: trunk/testsuites/t_unixodbc_sap/sap_colattrb.c
===================================================================
--- trunk/testsuites/t_unixodbc_sap/sap_colattrb.c	2007-06-08 16:03:49 UTC (rev 137)
+++ trunk/testsuites/t_unixodbc_sap/sap_colattrb.c	2007-06-11 09:38:09 UTC (rev 138)
@@ -74,30 +74,29 @@
     TABLE_NAME, SQL_NTS,                  /* SQL_DESC_BASE_TABLE_NAME + len */
     SQL_TRUE,                             /* SQL_DESC_CASE_SENSITIVE, ignored */
     "", SQL_NTS,                          /* SQL_DESC_CATALOG_NAME + len */
-    SQL_VARCHAR,                          /* SQL_DESC_CONCISE_TYPE */
+    SQL_SMALLINT,                         /* SQL_DESC_CONCISE_TYPE */
     6,                                    /* SQL_DESC_DISPLAY_SIZE */
     SQL_FALSE,                            /* SQL_DESC_FIXED_PREC_SCALE */
     "AGE", SQL_NTS,                       /* SQL_DESC_LABEL + len */
     6,                                    /* SQL_DESC_LENGTH */
-    "'", SQL_NTS,                         /* SQL_DESC_LITERAL_PREFIX + len */
-    "'", SQL_NTS,                         /* SQL_DESC_LITERAL_SUFFIX + len */
+    "", SQL_NTS,                          /* SQL_DESC_LITERAL_PREFIX + len */
+    "", SQL_NTS,                          /* SQL_DESC_LITERAL_SUFFIX + len */
     "", SQL_NTS,                          /* SQL_DESC_LOCAL_TYPE_NAME + len */
     "AGE", SQL_NTS,                       /* SQL_DESC_NAME + len */
     SQL_NULLABLE,                         /* SQL_DESC_NULLABLE */
-    0,                                    /* SQL_DESC_NUM_PREC_RADIX */
-    80,                                   /* SQL_DESC_OCTET_LENGTH */
-    80,                                   /* SQL_DESC_PRECISION */
+    10,                                   /* SQL_DESC_NUM_PREC_RADIX */
+    2,                                    /* SQL_DESC_OCTET_LENGTH */
+    6,                                    /* SQL_DESC_PRECISION */
     0,                                    /* SQL_DESC_SCALE */
     "", SQL_NTS,                          /* SQL_DESC_SCHEMA_NAME */
     SQL_PRED_SEARCHABLE,                  /* SQL_DESC_SEARCHABLE */
     TABLE_NAME, SQL_NTS,                  /* SQL_DESC_TABLE_NAME + len */
-    SQL_VARCHAR,                          /* SQL_DESC_TYPE */
+    SQL_SMALLINT,                         /* SQL_DESC_TYPE */
     "smallint", SQL_NTS,                  /* SQL_DESC_TYPE_NAME + len */
     SQL_NAMED,                            /* SQL_DESC_UNNAMED */
-    SQL_TRUE,                             /* SQL_DESC_UNSIGNED */
+    SQL_FALSE,                             /* SQL_DESC_UNSIGNED */
     SQL_ATTR_READWRITE_UNKNOWN            /* SQL_DESC_UPDATABLE */
   },
-
   /* stop condition and "documentation" */
   {
     "",                                   /* Column, used as a stop condition and for
error messages */
@@ -607,8 +606,6 @@
               (SQL_ATTR_READWRITE_UNKNOWN == col.updatable)
             );
     OT_ASSERT_INT_MSG(exp->column, exp->updatable, col.updatable);
-
-    printf("ret %d SQL_SUCCESS %d SQL_SUCCESS_WITH_INFO\n", ret, SQL_SUCCESS,
SQL_SUCCESS_WITH_INFO);
   }
 
   /* SQL_DESC_COUNT */
@@ -619,14 +616,14 @@
                                       (SQLPOINTER)&dummy_num),
                 hstmt);
   num_cols = (sizeof(colattrb_columns) / sizeof(COLLATTRB_STRUCT)) - 1;
-  if (dummy_num < num_cols)
+  if ((int)dummy_num < (int)num_cols)
   {
     snprintf(msg1, sizeof(msg1), "According to the test %d columns can be expected but
only %d are indicated. "
                                  "Either the test is wrong - unlikely - or the column
count is wrong - likely.",
             num_cols, dummy_num);
     OT_FAIL(msg1);
   } 
-  else
+  else if ((int)dummy_num > (int)num_cols)
   {
     snprintf(msg1, sizeof(msg1), "According to the test %d columns can be expected but 
%d are indicated. "
                                  "It is likely that the test is wrong and does not
contain the expected "