Changeset 183

Timestamp:

09/03/08 11:52:20 (4 months ago)

Author:

zork

Message:

merged odbc fix from trunk

Files:

• branches/debea_1_2/dba/dba/odbc.cpp (modified) (4 diffs)
• branches/debea_1_2/dba/dba/odbc.h (modified) (2 diffs)

branches/debea_1_2/dba/dba/odbc.cpp

@@ -741 +741 @@
-
-OdbcResult::~OdbcResult() {
+  delete[] mColumns;
-}
-
@@ -791 +792 @@
-};
-
+OdbcResult::ColumnData::ColumnData()
+: mNull(true),
+  mCharBuf(0),
+  mCharPtr(0),
+  mDataSize(0),
+  mBufCapacity(0),
+  mCType(SQL_UNKNOWN_TYPE)
+{
+}
+
-void 
-OdbcResult::ColumnData::init() {
+  //free old data
+  cleanup();
-  //prepare variant for data retrieval
-  //assuming that for variable sized columns
@@ -903 +916 @@
-};
-
+void 
+OdbcResult::ColumnData::cleanup() {
+  if (SQL_C_WCHAR == mCType || SQL_C_CHAR == mCType) {
+    delete [] mCharBuf;
+    mCharBuf = 0;
+    mCType = SQL_UNKNOWN_TYPE;
+    mCharPtr = 0;
+  }
+}
+
-void
-OdbcResult::ColumnData::decrementEndDataPtr() {
@@ -954 +977 @@
-};
-
-
-OdbcResult::ColumnData::~ColumnData() {
-delete [] mCharPtr
+cleanup()
-};
-
-OdbcResult::OdbcResult(OdbcConnection* pConn, HSTMT pHstmt) 
-
+
+
-{
-  setParentErrorHandler(pConn);

branches/debea_1_2/dba/dba/odbc.h

@@ -148 +148 @@
-    class ColumnData {
-      public:
- {}
+
-        /**
-          Get pointer to first byte of retrieved data
@@ -214 +214 @@
-        ColumnData(const ColumnData&);
-        ColumnData& ColumnData::operator=(const ColumnData&);
+        /**
+        Remove all previously assigned data
+        */
+        void cleanup();
-        /**
-          Row data. Variant used depends on mColumn.getOdbcType