[Carob-commits] CVS update of carob (include/Connection.hpp src/Connection.cpp)

[gilles]

    Date: Friday, November 18, 2005 @ 17:47:51
  Author: gilles
    Path: /cvsroot/carob/carob

Modified: include/Connection.hpp (1.19 -> 1.20) src/Connection.cpp (1.22
          -> 1.23)

Renamed ExecXXXRequest to StatementExecuteXXX and StoredProcXXX to 
CallableStatementXXX
Applied protocol change: no need to send the query type anymore


------------------------+
 include/Connection.hpp |   14 ++++++++------
 src/Connection.cpp     |    7 ++-----
 2 files changed, 10 insertions(+), 11 deletions(-)


Index: carob/include/Connection.hpp
diff -u carob/include/Connection.hpp:1.19 carob/include/Connection.hpp:1.20
--- carob/include/Connection.hpp:1.19   Tue Nov 15 17:20:28 2005
+++ carob/include/Connection.hpp        Fri Nov 18 17:47:51 2005
@@ -25,14 +25,16 @@
 #include "CriticalSection.hpp"
 #include "DriverSocket.hpp"
 
-#define ProtocolVersion                         23
+#define ProtocolVersion                         24
 
 //#define Ping                                    -1
-#define ExecReadRequest                         0
-#define ExecWriteRequest                        1
-//#define ExecWriteRequestWithKeys                2
-//#define ExecReadStoredProcedure                 3
-//#define ExecWriteStoredProcedure                4
+#define StatementExecuteQuery                   0
+#define StatementExecuteUpdate                  1
+//#define StatementExecuteUpdateWithKeys          2
+//#define CallableStatementExecuteQuery           3
+//#define CallableStatementExecuteUpdate          4
+//#define CallableStatementExecute                5
+//#define StatementExecute                        6
 #define Begin                                   20
 #define Commit                                  21
 #define Rollback                                22
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.22 carob/src/Connection.cpp:1.23
--- carob/src/Connection.cpp:1.22       Tue Nov 15 18:20:48 2005
+++ carob/src/Connection.cpp    Fri Nov 18 17:47:51 2005
@@ -444,7 +444,7 @@
   try
   {
     setConnectionParametersOnRequest(r);
-    *driverSocketPtr<<ExecWriteRequest;
+    *driverSocketPtr<<StatementExecuteUpdate;
     writeRequestOnStream(r);
     controllerResponse = receiveIntOrException();
   }
@@ -475,8 +475,6 @@
   if (!autoCommit)
     writeExecutedInTransaction = true;
 
-  *driverSocketPtr<<request.getType();
-
   request.sendToStream(*driverSocketPtr, controllerNeedsSqlSkeleton);
 
 }
@@ -496,8 +494,7 @@
   try
   {
     setConnectionParametersOnRequest(sr);
-    *driverSocketPtr<<ExecReadRequest;
-    *driverSocketPtr<<sr.getType();
+    *driverSocketPtr<<StatementExecuteQuery;
     sr.sendToStream(*driverSocketPtr, controllerNeedsSqlSkeleton);
     
     if (isDebugEnabled())

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