ODBC C-tests commit: r123 - trunk/testsuites/t_jbalint

[jbalint]

Modified:
   trunk/testsuites/t_jbalint/catalog.c
Log:
added test for blank basename when it's not a simple column name, but more complex
expression

Modified: trunk/testsuites/t_jbalint/catalog.c
===================================================================
--- trunk/testsuites/t_jbalint/catalog.c	2007-06-04 10:16:31 UTC (rev 122)
+++ trunk/testsuites/t_jbalint/catalog.c	2007-06-04 15:31:54 UTC (rev 123)
@@ -941,7 +941,8 @@
     SQLINTEGER numval;
     SQLCHAR strval[STRLEN];
     SQLSMALLINT strvallen;
-    const char *selqry = "select rowid, details, age from simple1";
+    const char *selqry = "select rowid, details, age, "
+        "1+1 as something from simple1";
 
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)selqry, SQL_NTS), stmt);
     CHECK_SQL_S(SQLColAttribute(stmt, 1, SQL_DESC_AUTO_UNIQUE_VALUE,
@@ -951,7 +952,19 @@
     CHECK_SQL_S(SQLColAttribute(stmt, 1, SQL_DESC_BASE_COLUMN_NAME,
         strval, STRLEN, &strvallen, NULL), stmt);
     test_printf("SQL_DESC_BASE_COLUMN_NAME=%s len=%d\n", strval, strvallen);
+    OT_ASSERT_STR("rowid", strval);
+    OT_ASSERT_INT(strlen("rowid"), strvallen);
 
+    CHECK_SQL_S(SQLColAttribute(stmt, 4, SQL_DESC_BASE_COLUMN_NAME,
+        strval, STRLEN, &strvallen, NULL), stmt);
+    /* Should be blank for an expression, per spec */
+    OT_ASSERT_STR("", strval);
+    OT_ASSERT_INT(0, strvallen);
+    CHECK_SQL_S(SQLColAttribute(stmt, 4, SQL_DESC_LABEL,
+        strval, STRLEN, &strvallen, NULL), stmt);
+    OT_ASSERT_STR("something", strval);
+    OT_ASSERT_INT(strlen("something"), strvallen);
+
     free_statement(stmt);
 }