Date: Wednesday, November 23, 2005 @ 15:14:37
  Author: gilles
    Path: /cvsroot/carob/carob

Modified: include/DriverResultSet.hpp (1.6 -> 1.7) src/DriverResultSet.cpp
          (1.6 -> 1.7)

Added ResultSetOrUpdateCount structure for statementExecute() function return 
type


-----------------------------+
 include/DriverResultSet.hpp |   13 ++++++++++++-
 src/DriverResultSet.cpp     |    1 +
 2 files changed, 13 insertions(+), 1 deletion(-)


Index: carob/include/DriverResultSet.hpp
diff -u carob/include/DriverResultSet.hpp:1.6 
carob/include/DriverResultSet.hpp:1.7
--- carob/include/DriverResultSet.hpp:1.6       Thu Nov 10 12:03:33 2005
+++ carob/include/DriverResultSet.hpp   Wed Nov 23 15:14:37 2005
@@ -25,7 +25,6 @@
 #include <vector>
 #include <ext/hash_map>
 
-#include "Connection.hpp"
 #include "Field.hpp"
 #include "SQLDataSerialization.hpp"
 
@@ -60,6 +59,7 @@
 #define CONCUR_UPDATABLE 1008
 
 class Statement;
+class Connection;
 /**
  * A <code>ResultSet</code> provides access to a table of data generated by
  * executing a Statement. The table rows are retrieved in sequence. Within a 
row
@@ -248,4 +248,15 @@
 
 };
 
+/**
+ * Structure for storing the result of an execute() command.
+ * This result is a list of either ResultSet or updateCount. So the result
+ * representation will be a list of <this structure> elements
+ */
+typedef struct
+{
+  bool isResultSet;
+  union RSorUC { DriverResultSet* resultSetPtr; int updateCount; } value;
+} ResultSetOrUpdateCount;
+
 #endif /*DRIVERRESULTSET_H_*/
Index: carob/src/DriverResultSet.cpp
diff -u carob/src/DriverResultSet.cpp:1.6 carob/src/DriverResultSet.cpp:1.7
--- carob/src/DriverResultSet.cpp:1.6   Thu Nov 10 12:03:33 2005
+++ carob/src/DriverResultSet.cpp       Wed Nov 23 15:14:37 2005
@@ -21,6 +21,7 @@
 
 #include "CarobException.hpp"
 #include "Common.hpp"
+#include "Connection.hpp"
 #include "DriverResultSet.hpp"
 #include "TypeTag.hpp"
 #include "Statement.hpp"

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

Reply via email to