[Carob-commits] CVS update of odbsequoia/src (simpletest.c)

[marc]

    Date: Friday, January 13, 2006 @ 00:16:12
  Author: marc
    Path: /cvsroot/carob/odbsequoia/src

Modified: simpletest.c (1.4 -> 1.5)

Now also testing a failure. Added bool flag to go testing on despite failure.


--------------+
 simpletest.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)


Index: odbsequoia/src/simpletest.c
diff -u odbsequoia/src/simpletest.c:1.4 odbsequoia/src/simpletest.c:1.5
--- odbsequoia/src/simpletest.c:1.4     Thu Jan 12 23:41:10 2006
+++ odbsequoia/src/simpletest.c Fri Jan 13 00:16:12 2006
@@ -32,12 +32,12 @@
 }
 
 // can you spell: "functional language" ?
-#define EXEC_AND_DIAGS(call, type, hdle)   \
-    printf ("executing: %s\n", #call);     \
-    retcode = call ;                       \
-    print_diags(pc, type, hdle);           \
-    if (! SQL_SUCCEEDED(retcode))          \
-        return pc;                         \
+#define EXEC_AND_DIAGS(call, type, hdle, cont)            \
+    printf ("executing: %s\n", #call);                    \
+    retcode = call ;                                      \
+    print_diags(pc, type, hdle);                          \
+    if (! SQL_SUCCEEDED(retcode) && ! cont)               \
+        return pc;                                        \
     pc++
 
 
@@ -54,16 +54,16 @@
     pc++;
 
     EXEC_AND_DIAGS(SQLSetEnvAttr(henv, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) 
SQL_OV_ODBC3, 0),
-                   SQL_HANDLE_ENV, henv);
+                   SQL_HANDLE_ENV, henv, 0);
 
     EXEC_AND_DIAGS(SQLAllocHandle(SQL_HANDLE_DBC, henv, &hdbc),
-                   SQL_HANDLE_ENV, henv);
+                   SQL_HANDLE_ENV, henv, 0);
 
 
 #if SEQTEST // sequoia
     EXEC_AND_DIAGS(SQLConnect(hdbc, (SQLCHAR *) "seqsource",
                               SQL_NTS, (SQLCHAR *) "user", SQL_NTS, (SQLCHAR 
*) "", SQL_NTS),
-                    SQL_HANDLE_DBC, hdbc);
+                    SQL_HANDLE_DBC, hdbc, 0);
 
 #else // postgres
     EXEC_AND_DIAGS(SQL_SUCCEEDED (SQLConnect(hdbc, (SQLCHAR *) "directPG", 
SQL_NTS,
@@ -74,13 +74,16 @@
 
 
     EXEC_AND_DIAGS(SQLAllocHandle(SQL_HANDLE_STMT, hdbc, &hstmt),
-                   SQL_HANDLE_DBC, hdbc);
+                   SQL_HANDLE_DBC, hdbc, 0);
+
+    EXEC_AND_DIAGS(SQLExecDirect(hstmt, (SQLCHAR *) "INSERT INTO PRODUCT 
values (1, 'dup', 4.5)", SQL_NTS),
+                   SQL_HANDLE_STMT, hstmt, 1);
 
     EXEC_AND_DIAGS(SQLExecDirect(hstmt, (SQLCHAR *) "UPDATE PRODUCT set 
cost=3.1422 where ID=1", SQL_NTS),
-                   SQL_HANDLE_STMT, hstmt);
+                   SQL_HANDLE_STMT, hstmt, 0);
     
     SQLINTEGER uc = 0;
-    EXEC_AND_DIAGS(SQLRowCount(hstmt, &uc), SQL_HANDLE_STMT, hstmt);
+    EXEC_AND_DIAGS(SQLRowCount(hstmt, &uc), SQL_HANDLE_STMT, hstmt, 0);
 
 
     printf ("%ld rows were updated\n", uc);

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits