Date: Friday, January 13, 2006 @ 17:28:14
  Author: marc
    Path: /cvsroot/carob/odbsequoia/src

Modified: simpletest.c (1.5 -> 1.6)

Formatting


--------------+
 simpletest.c |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)


Index: odbsequoia/src/simpletest.c
diff -u odbsequoia/src/simpletest.c:1.5 odbsequoia/src/simpletest.c:1.6
--- odbsequoia/src/simpletest.c:1.5     Fri Jan 13 00:16:12 2006
+++ odbsequoia/src/simpletest.c Fri Jan 13 17:28:14 2006
@@ -8,7 +8,7 @@
 // !log_info.log_flag && !ODBCSharedTraceFlag
 
 
-#define SEQTEST 1
+#define SEQTEST 1 // else postgreSQL
 
 void print_diags(int pc, SQLSMALLINT hdletype, SQLHANDLE hdle)
 {
@@ -53,37 +53,47 @@
         return pc;
     pc++;
 
-    EXEC_AND_DIAGS(SQLSetEnvAttr(henv, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) 
SQL_OV_ODBC3, 0),
-                   SQL_HANDLE_ENV, henv, 0);
-
-    EXEC_AND_DIAGS(SQLAllocHandle(SQL_HANDLE_DBC, henv, &hdbc),
-                   SQL_HANDLE_ENV, henv, 0);
+    EXEC_AND_DIAGS(
+        SQLSetEnvAttr(henv, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) SQL_OV_ODBC3, 
0),
+        SQL_HANDLE_ENV, henv, 0);
+
+    EXEC_AND_DIAGS(
+        SQLAllocHandle(SQL_HANDLE_DBC, henv, &hdbc),
+        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, 0);
+    EXEC_AND_DIAGS(
+        SQLConnect(hdbc, (SQLCHAR *) "seqsource", SQL_NTS, (SQLCHAR *) "user", 
SQL_NTS, 
+                   (SQLCHAR *) "", SQL_NTS),
+        SQL_HANDLE_DBC, hdbc, 0);
 
 #else // postgres
-    EXEC_AND_DIAGS(SQL_SUCCEEDED (SQLConnect(hdbc, (SQLCHAR *) "directPG", 
SQL_NTS,
-                                             (SQLCHAR *) "postgres", SQL_NTS,
-                                             (SQLCHAR *) "", SQL_NTS)),
-                   SQL_HANDLE_DBC, hdbc);
+    EXEC_AND_DIAGS(
+        SQLConnect(hdbc, (SQLCHAR *) "directPG", SQL_NTS,
+                   (SQLCHAR *) "postgres", SQL_NTS,
+                   (SQLCHAR *) "", SQL_NTS),
+        SQL_HANDLE_DBC, hdbc, 0);
 #endif
 
-
-    EXEC_AND_DIAGS(SQLAllocHandle(SQL_HANDLE_STMT, hdbc, &hstmt),
-                   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, 0);
+    EXEC_AND_DIAGS(
+        SQLAllocHandle(SQL_HANDLE_STMT, hdbc, &hstmt),
+        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, 0);
     
     SQLINTEGER uc = 0;
-    EXEC_AND_DIAGS(SQLRowCount(hstmt, &uc), SQL_HANDLE_STMT, hstmt, 0);
+    EXEC_AND_DIAGS(
+        SQLRowCount(hstmt, &uc),
+        SQL_HANDLE_STMT, hstmt, 0);
 
 
     printf ("%ld rows were updated\n", uc);

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to