List:Commits« Previous MessageNext Message »
From:pharvey Date:January 6 2006 11:06pm
Subject:Connector/ODBC 5 commit: r31 - MYODBCDbg/include MYODBCDes/MYODBCDesLib MYODBCDes/include
View as plain text  
Modified:
   MYODBCDbg/include/MYODBCDbg.h
   MYODBCDes/MYODBCDesLib/MYODBCDes.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesRec.h
   MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
   MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
   MYODBCDes/include/MYODBCDes.h
Log:
UNICODE:
- descriptors now clean compiles
- need to inject some of the missing odbc rules into it

Modified: MYODBCDbg/include/MYODBCDbg.h
===================================================================
--- MYODBCDbg/include/MYODBCDbg.h	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDbg/include/MYODBCDbg.h	2006-01-06 23:06:40 UTC (rev 31)
@@ -191,17 +191,18 @@
 }\
 }
 
-#define MYODBCDbgReturn3(A)\
+#define MYODBCDbgReturn3(A,B)\
 {\
 if ( gpMYODBCDbg )\
 {\
-    QString stringHeader = QString( "%1:%2: %3 [RETURN ] %4" )\
+    QString stringMessage;\
+    QString stringHeader = QString( "%1:%2: %3 [RETURN ] " )\
                             .arg( __FILE__ )\
                             .arg( __LINE__ )\
-                            .arg( __FUNCTION__ )\
-                            .arg( A );\
-    *gpMYODBCDbg << stringHeader << endl;\
+                            .arg( __FUNCTION__ );\
+    *gpMYODBCDbg << stringHeader << stringMessage.sprintf( A, B ) <<
endl;\
 }\
+return ( B );\
 }
 
 #else
@@ -213,7 +214,7 @@
 #define MYODBCDbgWarning(A,B){}
 #define MYODBCDbgReturn(A) return(A)
 #define MYODBCDbgReturn2()   {}
-#define MYODBCDbgReturn3(A)  {}
+#define MYODBCDbgReturn3(A,B){}
 #endif
 
 #endif

Modified: MYODBCDes/MYODBCDesLib/MYODBCDes.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDes.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDes.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -46,6 +46,8 @@
     /* associate with our owner (caller needs to add us to hOwner's list of descriptors)
*/
     this->hOwner        = hOwner;
 
+    pdia = new MYODBCDia();
+
     MYODBCDbgReturn2();
 }
 
@@ -75,6 +77,8 @@
     while ( !listRecords.isEmpty() )
         delete listRecords[0];
 
+    delete pdia;
+
     MYODBCDbgReturn2();
 }
 
@@ -88,7 +92,7 @@
         This argument must be equal to or greater than 0.
     */
     if ( nRecNumber < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /*
         \internal ODBC Rule
@@ -505,7 +509,7 @@
     MYODBCDbgEnter();
 
     if ( nRecNumber < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /*! \internal ODBC Rule
         
@@ -575,7 +579,7 @@
         The RecNumber argument was less than 0.
     */
     if ( nRecNumber < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /*! \internal ODBC Rule
 
@@ -592,49 +596,49 @@
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nAllocType );
+    MYODBCDbgReturn3( "%d", nAllocType );
 }
 
 SQLUINTEGER MYODBCDes::getArraySize()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nArraySize );
+    MYODBCDbgReturn3( "%d", nArraySize );
 }
 
 SQLUSMALLINT *MYODBCDes::getArrayStatusPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pnArrayStatusPtr );
+    MYODBCDbgReturn3( "%p", pnArrayStatusPtr );
 }
 
 SQLINTEGER *MYODBCDes::getBindOffsetPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pnBindOffsetPtr );
+    MYODBCDbgReturn3( "%p", pnBindOffsetPtr );
 }
 
 SQLUINTEGER MYODBCDes::getBindType()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nBindType );
+    MYODBCDbgReturn3( "%d", nBindType );
 }
 
 SQLSMALLINT MYODBCDes::getCount()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( listRecords.count() );
+    MYODBCDbgReturn3( "%d", listRecords.count() );
 }
 
 SQLUINTEGER *MYODBCDes::getRowsProcessedPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pnRowsProcessedPtr );
+    MYODBCDbgReturn3( "%p", pnRowsProcessedPtr );
 }
 
 
@@ -645,7 +649,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getAutoUniqueValue() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getAutoUniqueValue() );
 }
 
 QString     MYODBCDes::getBaseColumnName( SQLSMALLINT nRecord )
@@ -655,7 +659,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getBaseColumnName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getBaseColumnName() );
 }
 
 QString     MYODBCDes::getBaseTableName( SQLSMALLINT nRecord )
@@ -665,7 +669,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getBaseTableName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getBaseTableName() );
 }
 
 SQLINTEGER  MYODBCDes::getCaseSensitive( SQLSMALLINT nRecord )
@@ -675,7 +679,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getCaseSensitive() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getCaseSensitive() );
 }
 
 QString     MYODBCDes::getCatalogName( SQLSMALLINT nRecord )
@@ -685,7 +689,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getCatalogName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getCatalogName() );
 }
 
 SQLSMALLINT MYODBCDes::getConciseType( SQLSMALLINT nRecord )
@@ -695,7 +699,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getConciseType() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getConciseType() );
 }
 
 SQLPOINTER  MYODBCDes::getDataPtr( SQLSMALLINT nRecord )
@@ -705,7 +709,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getDataPtr() );
+    MYODBCDbgReturn3( "%p", listRecords[nRecord]->getDataPtr() );
 }
 
 SQLSMALLINT MYODBCDes::getDatetimeIntervalCode( SQLSMALLINT nRecord )
@@ -715,7 +719,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getDatetimeIntervalCode() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getDatetimeIntervalCode() );
 }
 
 SQLINTEGER  MYODBCDes::getDatetimeIntervalPrecision( SQLSMALLINT nRecord )
@@ -725,7 +729,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getDatetimeIntervalPrecision() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getDatetimeIntervalPrecision() );
 }
 
 SQLINTEGER  MYODBCDes::getDisplaySize( SQLSMALLINT nRecord )
@@ -735,7 +739,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getDisplaySize() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getDisplaySize() );
 }
 
 SQLSMALLINT MYODBCDes::getFixedPrecScale( SQLSMALLINT nRecord )
@@ -745,7 +749,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getFixedPrecScale() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getFixedPrecScale() );
 }
 
 SQLINTEGER *MYODBCDes::getIndicatorPtr( SQLSMALLINT nRecord )
@@ -755,7 +759,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getIndicatorPtr() );
+    MYODBCDbgReturn3( "%p", listRecords[nRecord]->getIndicatorPtr() );
 }
 
 QString     MYODBCDes::getLabel( SQLSMALLINT nRecord )
@@ -765,7 +769,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getLabel() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getLabel() );
 }
 
 SQLUINTEGER MYODBCDes::getLength( SQLSMALLINT nRecord )
@@ -775,7 +779,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getLength() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getLength() );
 }
 
 QString     MYODBCDes::getLiteralPrefix( SQLSMALLINT nRecord )
@@ -785,7 +789,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getLiteralPrefix() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getLiteralPrefix() );
 }
 
 QString     MYODBCDes::getLiteralSuffix( SQLSMALLINT nRecord )
@@ -795,7 +799,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getLiteralSuffix() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getLiteralSuffix() );
 }
 
 QString     MYODBCDes::getLocalTypeName( SQLSMALLINT nRecord )
@@ -805,7 +809,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getLocalTypeName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getLocalTypeName() );
 }
 
 QString     MYODBCDes::getName( SQLSMALLINT nRecord )
@@ -815,7 +819,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getName() );
 }
 
 SQLSMALLINT MYODBCDes::getNullable( SQLSMALLINT nRecord )
@@ -825,7 +829,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getNullable() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getNullable() );
 }
 
 SQLINTEGER  MYODBCDes::getNumPrecRadix( SQLSMALLINT nRecord )
@@ -835,7 +839,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getNumPrecRadix() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getNumPrecRadix() );
 }
 
 SQLINTEGER  MYODBCDes::getOctetLength( SQLSMALLINT nRecord )
@@ -845,7 +849,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getOctetLength() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getOctetLength() );
 }
 
 SQLINTEGER *MYODBCDes::getOctetLengthPtr( SQLSMALLINT nRecord )
@@ -855,7 +859,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getOctetLengthPtr() );
+    MYODBCDbgReturn3( "%p", listRecords[nRecord]->getOctetLengthPtr() );
 }
 
 SQLSMALLINT MYODBCDes::getParamterType( SQLSMALLINT nRecord )
@@ -865,7 +869,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getParamterType() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getParamterType() );
 }
 
 SQLSMALLINT MYODBCDes::getPrecision( SQLSMALLINT nRecord )
@@ -875,7 +879,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getPrecision() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getPrecision() );
 }
 
 SQLSMALLINT MYODBCDes::getRowver( SQLSMALLINT nRecord )
@@ -885,7 +889,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getRowver() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getRowver() );
 }
 
 SQLSMALLINT MYODBCDes::getScale( SQLSMALLINT nRecord )
@@ -895,7 +899,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getScale() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getScale() );
 }
 
 QString     MYODBCDes::getSchemaName( SQLSMALLINT nRecord )
@@ -905,7 +909,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getSchemaName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getSchemaName() );
 }
 
 SQLSMALLINT MYODBCDes::getSearchable( SQLSMALLINT nRecord )
@@ -915,7 +919,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getSearchable() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getSearchable() );
 }
 
 QString     MYODBCDes::getTableName( SQLSMALLINT nRecord )
@@ -925,7 +929,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getTableName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getTableName() );
 }
 
 SQLSMALLINT MYODBCDes::getType( SQLSMALLINT nRecord )
@@ -935,7 +939,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getType() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getType() );
 }
 
 QString     MYODBCDes::getTypeName( SQLSMALLINT nRecord )
@@ -945,7 +949,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getTypeName() );
+    MYODBCDbgReturn3( "%s", listRecords[nRecord]->getTypeName() );
 }
 
 SQLSMALLINT MYODBCDes::getUnnamed( SQLSMALLINT nRecord )
@@ -955,7 +959,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getUnnamed() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getUnnamed() );
 }
 
 SQLSMALLINT MYODBCDes::getUnsigned( SQLSMALLINT nRecord )
@@ -965,7 +969,7 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getUnsigned() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getUnsigned() );
 }
 
 SQLSMALLINT MYODBCDes::getUpdatable( SQLSMALLINT nRecord )
@@ -975,14 +979,20 @@
     Q_ASSERT( nRecord < 0 );
     Q_ASSERT( nRecord >= listRecords.count() );
 
-    MYODBCDbgReturn3( listRecords[nRecord]->getUpdatable() );
+    MYODBCDbgReturn3( "%d", listRecords[nRecord]->getUpdatable() );
 }
 
 SQLHANDLE MYODBCDes::getOwner()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)hOwner );
+    MYODBCDbgReturn3( "%p", hOwner );
 }
 
+MYODBCDia *MYODBCDes::getDia()
+{
+    MYODBCDbgEnter();
 
+    MYODBCDbgReturn3( "%p", pdia );
+}
+

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -36,7 +36,7 @@
                 IRD: R
                 IPD: R
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ARRAY_SIZE:
             /*!
@@ -112,13 +112,13 @@
                 IRD: R/W
                 IPD: R/W          
             */    
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
     } /* switch (for header fields) */
 
     /* record field needs a valid record */
     if ( nRecNumber < 0 || nRecNumber >= getCount() )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* handle as record field */
     MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
@@ -153,7 +153,7 @@
         less than 0.
     */
     if ( nCount < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* append */
     while ( nCount > listRecords.count() )

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -44,7 +44,7 @@
 
                 ARD: R
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ARRAY_SIZE:
             /*!
@@ -92,7 +92,7 @@
                 Sanity check. Value must >=0
             */
             if ( (SQLINTEGER)pValuePtr < 0 )
-                MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY000, 0, "Value must be >=
0." ) );
+                MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY000, 0, "Value must
be >= 0." ) );
 
             MYODBCDbgReturn( setBindType( (SQLINTEGER)pValuePtr) );
 
@@ -111,13 +111,13 @@
 
                 ARD: Unused
             */    
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
     } /* switch (for header fields) */
 
     /* record field needs a valid record */
     if ( nRecNumber < 0 || nRecNumber >= getCount() )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* handle as record field */
     MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
@@ -147,7 +147,7 @@
 
     /* We should always have a bookmark record at index 0. */
     if ( nCount < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* append */
     while ( nCount > listRecords.count() )

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -47,7 +47,7 @@
                 IRD: R
                 IPD: R
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ARRAY_SIZE:
             /*!
@@ -58,7 +58,7 @@
                 IRD: Unused
                 IPD: Unused
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ARRAY_STATUS_PTR:
             /*!
@@ -80,7 +80,7 @@
                 IRD: Unused
                 IPD: Unused
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_BIND_TYPE:
             /*!
@@ -91,7 +91,7 @@
                 IRD: Unused
                 IPD: Unused
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_COUNT:
             /*!
@@ -120,7 +120,7 @@
 
     /* record field needs a valid record */
     if ( nRecNumber < 0 || nRecNumber >= getCount() )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* handle as record field */
     MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
@@ -150,7 +150,7 @@
 
     /* We should always have a bookmark record at index 0. */
     if ( nCount < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* append */
     while ( nCount > listRecords.count() )

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -50,7 +50,7 @@
 
                 IRD: Unused
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ARRAY_STATUS_PTR:
             /*!
@@ -78,7 +78,7 @@
 
                 IRD: R
             */
-            MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 
         case SQL_DESC_ROWS_PROCESSED_PTR:
             /*!
@@ -91,7 +91,7 @@
 
     /* record field needs a valid record */
     if ( nRecNumber < 0 || nRecNumber >= getCount() )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* handle as record field */
     MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
@@ -121,7 +121,7 @@
 
     /* We should always have a bookmark record at index 0. */
     if ( nCount < 0 )
-        MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
+        MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
 
     /* append */
     while ( nCount > listRecords.count() )

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -706,7 +706,7 @@
             break;
 
         default:
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
     }   
 
     MYODBCDbgReturn( SQL_SUCCESS );
@@ -716,241 +716,247 @@
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nAutoUniqueValue );
+    MYODBCDbgReturn3( "%d", nAutoUniqueValue );
 }
 
 QString     MYODBCDesRec::getBaseColumnName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringBaseColumnName );
+    MYODBCDbgReturn3( "%s", stringBaseColumnName );
 }
 
 QString     MYODBCDesRec::getBaseTableName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringBaseTableName );
+    MYODBCDbgReturn3( "%s", stringBaseTableName );
 }
 
 SQLINTEGER  MYODBCDesRec::getCaseSensitive()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nCaseSensitive );
+    MYODBCDbgReturn3( "%d", nCaseSensitive );
 }
 
 QString     MYODBCDesRec::getCatalogName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringCatalogName );
+    MYODBCDbgReturn3( "%s", stringCatalogName );
 }
 
 SQLSMALLINT MYODBCDesRec::getConciseType()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nConciseType );
+    MYODBCDbgReturn3( "%d", nConciseType );
 }
 
 SQLPOINTER  MYODBCDesRec::getDataPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pDataPtr );
+    MYODBCDbgReturn3( "%p", pDataPtr );
 }
 
 SQLSMALLINT MYODBCDesRec::getDatetimeIntervalCode()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nDatetimeIntervalCode );
+    MYODBCDbgReturn3( "%d", nDatetimeIntervalCode );
 }
 
 SQLINTEGER  MYODBCDesRec::getDatetimeIntervalPrecision()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nDatetimeIntervalPrecision );
+    MYODBCDbgReturn3( "%d", nDatetimeIntervalPrecision );
 }
 
 SQLINTEGER  MYODBCDesRec::getDisplaySize() 
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nDisplaySize );
+    MYODBCDbgReturn3( "%d", nDisplaySize );
 }
 
 SQLSMALLINT MYODBCDesRec::getFixedPrecScale()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nFixedPrecScale );
+    MYODBCDbgReturn3( "%d", nFixedPrecScale );
 }
 
 SQLINTEGER *MYODBCDesRec::getIndicatorPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pnIndicatorPtr );
+    MYODBCDbgReturn3( "%p", pnIndicatorPtr );
 }
 
 QString     MYODBCDesRec::getLabel()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringLabel );
+    MYODBCDbgReturn3( "%s", stringLabel );
 }
 
 SQLUINTEGER MYODBCDesRec::getLength()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nLength );
+    MYODBCDbgReturn3( "%d", nLength );
 }
 
 QString     MYODBCDesRec::getLiteralPrefix()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringLiteralPrefix );
+    MYODBCDbgReturn3( "%s", stringLiteralPrefix );
 }
 
 QString     MYODBCDesRec::getLiteralSuffix()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringLiteralSuffix );
+    MYODBCDbgReturn3( "%s", stringLiteralSuffix );
 }
 
 QString     MYODBCDesRec::getLocalTypeName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringLocalTypeName );
+    MYODBCDbgReturn3( "%s", stringLocalTypeName );
 }
 
 QString     MYODBCDesRec::getName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringName );
+    MYODBCDbgReturn3( "%s", stringName );
 }
 
 SQLSMALLINT MYODBCDesRec::getNullable()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nNullable );
+    MYODBCDbgReturn3( "%d", nNullable );
 }
 
 SQLINTEGER  MYODBCDesRec::getNumPrecRadix()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nNumPrecRadix );
+    MYODBCDbgReturn3( "%d", nNumPrecRadix );
 }
 
 SQLINTEGER  MYODBCDesRec::getOctetLength()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nOctetLength );
+    MYODBCDbgReturn3( "%d", nOctetLength );
 }
 
 SQLINTEGER *MYODBCDesRec::getOctetLengthPtr()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( (qlonglong)pnOctetLengthPtr );
+    MYODBCDbgReturn3( "%p", pnOctetLengthPtr );
 }
 
 SQLSMALLINT MYODBCDesRec::getParamterType()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nParamterType );
+    MYODBCDbgReturn3( "%d", nParamterType );
 }
 
 SQLSMALLINT MYODBCDesRec::getPrecision()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nPrecision );
+    MYODBCDbgReturn3( "%d", nPrecision );
 }
 
 SQLSMALLINT MYODBCDesRec::getRowver()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nRowver );
+    MYODBCDbgReturn3( "%d", nRowver );
 }
 
 SQLSMALLINT MYODBCDesRec::getScale()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nScale );
+    MYODBCDbgReturn3( "%d", nScale );
 }
 
 QString     MYODBCDesRec::getSchemaName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringSchemaName );
+    MYODBCDbgReturn3( "%s", stringSchemaName );
 }
 
 SQLSMALLINT MYODBCDesRec::getSearchable()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nSearchable );
+    MYODBCDbgReturn3( "%d", nSearchable );
 }
 
 QString     MYODBCDesRec::getTableName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringTableName );
+    MYODBCDbgReturn3( "%s", stringTableName );
 }
 
 SQLSMALLINT MYODBCDesRec::getType()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nType );
+    MYODBCDbgReturn3( "%d", nType );
 }
 
 QString     MYODBCDesRec::getTypeName()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( stringTypeName );
+    MYODBCDbgReturn3( "%s", stringTypeName );
 }
 
 SQLSMALLINT MYODBCDesRec::getUnnamed()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nUnnamed );
+    MYODBCDbgReturn3( "%d", nUnnamed );
 }
 
 SQLSMALLINT MYODBCDesRec::getUnsigned()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nUnsigned );
+    MYODBCDbgReturn3( "%d", nUnsigned );
 }
 
 SQLSMALLINT MYODBCDesRec::getUpdatable()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( nUpdatable );
+    MYODBCDbgReturn3( "%d", nUpdatable );
 }
 
+MYODBCDes *MYODBCDesRec::getDes()
+{
+    MYODBCDbgEnter();
 
+    MYODBCDbgReturn3( "%p", pdes );
+}
+
 SQLRETURN MYODBCDesRec::doUnbind()
 {
     MYODBCDbgEnter();
@@ -972,7 +978,7 @@
         SQL_INTERVAL.
     */      
     if ( getType() != SQL_DATETIME && getType() != SQL_INTERVAL )
-        MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+        MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL )
);
 
     switch ( nDateTimeIntervalCode )
     {
@@ -992,7 +998,7 @@
             MYODBCDbgReturn( setDatetimeIntervalCode( nDateTimeIntervalCode ) );
     }
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
 }
 
 SQLRETURN MYODBCDesRec::setTypeC( SQLSMALLINT nType )
@@ -1034,7 +1040,7 @@
         case SQL_C_INTERVAL_HOUR_TO_MINUTE:
         case SQL_C_INTERVAL_HOUR_TO_SECOND:
         case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY021, 0,
NULL ) );
     }
 
     /*
@@ -1123,7 +1129,7 @@
                     setConciseType( SQL_C_TYPE_TIMESTAMP );
                     MYODBCDbgReturn( SQL_SUCCESS );
                 default:
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY021, 0, NULL ) );
             }
 
         case SQL_INTERVAL:        /* (10) verbose type (generalization)         */
@@ -1201,11 +1207,11 @@
                     setConciseType( SQL_C_INTERVAL_MINUTE_TO_SECOND );
                     MYODBCDbgReturn( SQL_SUCCESS );
                 default:
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY021, 0, NULL ) );
             }
     }
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
 }
 
 SQLRETURN MYODBCDesRec::setTypeSQL( SQLSMALLINT nType )
@@ -1245,7 +1251,7 @@
         case SQL_INTERVAL_HOUR_TO_MINUTE:
         case SQL_INTERVAL_HOUR_TO_SECOND:
         case SQL_INTERVAL_MINUTE_TO_SECOND:
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY021, 0,
NULL ) );
     }
 
     /*
@@ -1334,7 +1340,7 @@
                     setConciseType( SQL_TYPE_TIMESTAMP );
                     MYODBCDbgReturn( SQL_SUCCESS );
                 default:
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY021, 0, NULL ) );
             }
 
         case SQL_INTERVAL:        /* (10) verbose type (generalization)         */
@@ -1412,7 +1418,7 @@
                     setConciseType( SQL_INTERVAL_MINUTE_TO_SECOND );
                     MYODBCDbgReturn( SQL_SUCCESS );
                 default:
-                    MYODBCDbgReturn(  pdes->dia.doAppend( MYODBC_DIA_HY021, 0, NULL )
);
+                    MYODBCDbgReturn(  getDes()->getDia()->doAppend(
MYODBC_DIA_HY021, 0, NULL ) );
             }
 
         case SQL_GUID:            /* not in *real* ODBC spec - likely an MS'ism */
@@ -1422,7 +1428,7 @@
             MYODBCDbgReturn( SQL_SUCCESS );
     }
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
 }
 
 SQLRETURN MYODBCDesRec::setConciseTypeC( SQLSMALLINT nConciseType )
@@ -1572,7 +1578,7 @@
             MYODBCDbgReturn( SQL_SUCCESS );
     }
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
 }
 
 SQLRETURN MYODBCDesRec::setConciseTypeSQL( SQLSMALLINT nConciseType )
@@ -1725,7 +1731,7 @@
             MYODBCDbgReturn( SQL_SUCCESS );
     }
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
 }
 
 SQLRETURN MYODBCDesRec::doConsistencyCheck()

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRec.h
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRec.h	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRec.h	2006-01-06 23:06:40 UTC (rev 31)
@@ -114,6 +114,8 @@
     virtual SQLSMALLINT getUnsigned();
     virtual SQLSMALLINT getUpdatable();
 
+    MYODBCDes *getDes();
+
     /* do'rs */
     virtual SQLRETURN doUnbind();
 

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -21,7 +21,7 @@
     MYODBCDbgReturn2();
 }
 
-SQLRETURN MYODBCDesRecAPD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER nBufferLength )
+SQLRETURN MYODBCDesRecAPD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER /* nBufferLength */ )
 {
     MYODBCDbgEnter();
 
@@ -70,7 +70,7 @@
                 
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_CONCISE_TYPE:
             /*!
@@ -117,7 +117,7 @@
                 if ( bHasInfo )
                     MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
             }
-            MYODBCDbgReturn( SQL_SUCCEEDED );
+            MYODBCDbgReturn( SQL_SUCCESS );
 
         case SQL_DESC_DATETIME_INTERVAL_CODE:
             /*!
@@ -158,7 +158,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_INDICATOR_PTR:
             /*!
@@ -174,7 +174,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_LENGTH:
             /*!
@@ -214,7 +214,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_NUM_PREC_RADIX:
             /*!
@@ -238,7 +238,7 @@
                 SQLINTEGER n = (SQLINTEGER)pValuePtr;
 
                 if ( n != 0 && n != 2 && n != 10 )
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY092, 0, NULL ) );
             }
             
             MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
@@ -287,7 +287,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_PRECISION:
             /*!
@@ -314,7 +314,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_SCALE:
             /*!
@@ -350,7 +350,7 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_TYPE:
             /*!
@@ -384,9 +384,9 @@
       
                 APD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
     }   
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 }
 

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -21,7 +21,7 @@
     MYODBCDbgReturn2();
 }
 
-SQLRETURN MYODBCDesRecARD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER nBufferLength )
+SQLRETURN MYODBCDesRecARD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER /* nBufferLength */ )
 {
     MYODBCDbgEnter();
 
@@ -70,7 +70,7 @@
                 
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_CONCISE_TYPE:
             /*!
@@ -117,7 +117,7 @@
                 if ( bHasInfo )
                     MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
             }
-            MYODBCDbgReturn( SQL_SUCCEEDED );
+            MYODBCDbgReturn( SQL_SUCCESS );
 
         case SQL_DESC_DATETIME_INTERVAL_CODE:
             /*!
@@ -158,7 +158,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_INDICATOR_PTR:
             /*!
@@ -174,7 +174,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_LENGTH:
             /*!
@@ -214,7 +214,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_NUM_PREC_RADIX:
             /*!
@@ -238,7 +238,7 @@
                 SQLINTEGER n = (SQLINTEGER)pValuePtr;
 
                 if ( n != 0 && n != 2 && n != 10 )
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY092, 0, NULL ) );
             }
             
             MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
@@ -272,7 +272,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_PRECISION:
             /*!
@@ -299,7 +299,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_SCALE:
             /*!
@@ -335,7 +335,7 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_TYPE:
             /*!
@@ -369,9 +369,9 @@
       
                 ARD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
     }   
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 }
 

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -21,7 +21,7 @@
     MYODBCDbgReturn2();
 }
 
-SQLRETURN MYODBCDesRecIPD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER nBufferLength )
+SQLRETURN MYODBCDesRecIPD::setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER
pValuePtr, SQLINTEGER /* nBufferLength */ )
 {
     MYODBCDbgEnter();
 
@@ -70,7 +70,7 @@
                 
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_CONCISE_TYPE:
             /*!
@@ -117,7 +117,7 @@
                 if ( bHasInfo )
                     MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
             }
-            MYODBCDbgReturn( SQL_SUCCEEDED );
+            MYODBCDbgReturn( SQL_SUCCESS );
 
         case SQL_DESC_DATETIME_INTERVAL_CODE:
             /*!
@@ -158,7 +158,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_INDICATOR_PTR:
             /*!
@@ -174,7 +174,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_LENGTH:
             /*!
@@ -214,7 +214,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_NUM_PREC_RADIX:
             /*!
@@ -238,7 +238,7 @@
                 SQLINTEGER n = (SQLINTEGER)pValuePtr;
 
                 if ( n != 0 && n != 2 && n != 10 )
-                    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL )
);
+                    MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY092, 0, NULL ) );
             }
             
             MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
@@ -272,7 +272,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_PRECISION:
             /*!
@@ -299,7 +299,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_SCALE:
             /*!
@@ -335,7 +335,7 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
 
         case SQL_DESC_TYPE:
             /*!
@@ -369,9 +369,9 @@
       
                 IPD: Unused
             */
-            MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+            MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
     }   
 
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
 }
 

Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp	2006-01-06 23:06:40 UTC (rev 31)
@@ -30,6 +30,6 @@
         The DescriptorHandle argument was associated with an IRD, and the FieldIdentifier

         argument was not SQL_DESC_ARRAY_STATUS_PTR or SQL_DESC_ROWS_PROCESSED_PTR.
     */
-    MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY016, 0, NULL ) );
+    MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY016, 0, NULL ) );
 }
 

Modified: MYODBCDes/include/MYODBCDes.h
===================================================================
--- MYODBCDes/include/MYODBCDes.h	2006-01-06 06:48:42 UTC (rev 30)
+++ MYODBCDes/include/MYODBCDes.h	2006-01-06 23:06:40 UTC (rev 31)
@@ -180,10 +180,11 @@
 
     /* misc */
     SQLHANDLE getOwner();
+    MYODBCDia *getDia();
 
 protected:
     SQLHANDLE               hOwner;                /*!< dbc if explicit else stmt     
                */  
-    MYODBCDia               dia;                   /*!< errors, warnings, etc         
                */
+    MYODBCDia *             pdia;                  /*!< errors, warnings, etc         
                */
 
     SQLSMALLINT             nAllocType;
     SQLUINTEGER             nArraySize;

Thread
Connector/ODBC 5 commit: r31 - MYODBCDbg/include MYODBCDes/MYODBCDesLib MYODBCDes/includepharvey7 Jan