Connector/ODBC 5 commit: r583 - in trunk/SDK: C/Library C/include MYSQLPlus/Library

[pharvey]

Modified:
   trunk/SDK/C/Library/MYODBCC.cpp
   trunk/SDK/C/include/MYODBCC.h
   trunk/SDK/MYSQLPlus/Library/MConnection.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
   trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
   trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
ENH: slightly better logging


Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/C/Library/MYODBCC.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -490,6 +490,100 @@
     return "unknown";
 }
 
+QString MYODBCC::getDescFieldString( SQLSMALLINT nField )
+{
+    switch ( nField )
+    {
+        /* header fields */
+        case SQL_DESC_ALLOC_TYPE:
+            return "SQL_DESC_ALLOC_TYPE";
+        case SQL_DESC_ARRAY_SIZE:
+            return "SQL_DESC_ARRAY_SIZE";
+        case SQL_DESC_ARRAY_STATUS_PTR:
+            return "SQL_DESC_ARRAY_STATUS_PTR";
+        case SQL_DESC_BIND_OFFSET_PTR:
+            return "SQL_DESC_BIND_OFFSET_PTR";
+        case SQL_DESC_BIND_TYPE:
+            return "SQL_DESC_BIND_TYPE";
+        case SQL_DESC_COUNT:
+            return "SQL_DESC_COUNT";
+        case SQL_DESC_ROWS_PROCESSED_PTR:
+            return "SQL_DESC_ROWS_PROCESSED_PTR";
+        /* record fields */
+        case SQL_DESC_AUTO_UNIQUE_VALUE:
+            return "SQL_DESC_AUTO_UNIQUE_VALUE";
+        case SQL_DESC_BASE_COLUMN_NAME:
+            return "SQL_DESC_BASE_COLUMN_NAME";
+        case SQL_DESC_BASE_TABLE_NAME:
+            return "SQL_DESC_BASE_TABLE_NAME";
+        case SQL_DESC_CASE_SENSITIVE:
+            return "SQL_DESC_CASE_SENSITIVE";
+        case SQL_DESC_CATALOG_NAME:
+            return "SQL_DESC_CATALOG_NAME";
+        case SQL_DESC_CONCISE_TYPE:
+            return "SQL_DESC_CONCISE_TYPE";
+        case SQL_DESC_DATA_PTR:
+            return "SQL_DESC_DATA_PTR";
+        case SQL_DESC_DATETIME_INTERVAL_CODE:
+            return "SQL_DESC_DATETIME_INTERVAL_CODE";
+        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
+            return "SQL_DESC_DATETIME_INTERVAL_PRECISION";
+        case SQL_DESC_DISPLAY_SIZE:
+            return "SQL_DESC_DISPLAY_SIZE";
+        case SQL_DESC_FIXED_PREC_SCALE:
+            return "SQL_DESC_FIXED_PREC_SCALE";
+        case SQL_DESC_INDICATOR_PTR:
+            return "SQL_DESC_INDICATOR_PTR";
+        case SQL_DESC_LABEL:
+            return "SQL_DESC_LABEL";
+        case SQL_DESC_LENGTH:
+            return "SQL_DESC_LENGTH";
+        case SQL_DESC_LITERAL_PREFIX:
+            return "SQL_DESC_LITERAL_PREFIX";
+        case SQL_DESC_LITERAL_SUFFIX:
+            return "SQL_DESC_LITERAL_SUFFIX";
+        case SQL_DESC_LOCAL_TYPE_NAME:
+            return "SQL_DESC_LOCAL_TYPE_NAME";
+        case SQL_DESC_NAME:
+            return "SQL_DESC_NAME";
+        case SQL_DESC_NULLABLE:
+            return "SQL_DESC_NULLABLE";
+        case SQL_DESC_NUM_PREC_RADIX:
+            return "SQL_DESC_NUM_PREC_RADIX";
+        case SQL_DESC_OCTET_LENGTH:
+            return "SQL_DESC_OCTET_LENGTH";
+        case SQL_DESC_OCTET_LENGTH_PTR:
+            return "SQL_DESC_OCTET_LENGTH_PTR";
+        case SQL_DESC_PARAMETER_TYPE:
+            return "SQL_DESC_PARAMETER_TYPE";
+        case SQL_DESC_PRECISION:
+            return "SQL_DESC_PRECISION";
+        case SQL_DESC_ROWVER:
+            return "SQL_DESC_ROWVER";
+        case SQL_DESC_SCALE:
+            return "SQL_DESC_SCALE";
+        case SQL_DESC_SCHEMA_NAME:
+            return "SQL_DESC_SCHEMA_NAME";
+        case SQL_DESC_SEARCHABLE:
+            return "SQL_DESC_SEARCHABLE";
+        case SQL_DESC_TABLE_NAME:
+            return "SQL_DESC_TABLE_NAME";
+        case SQL_DESC_TYPE:
+            return "SQL_DESC_TYPE";
+        case SQL_DESC_TYPE_NAME:
+            return "SQL_DESC_TYPE_NAME";
+        case SQL_DESC_UNNAMED:
+            return "SQL_DESC_UNNAMED";
+        case SQL_DESC_UNSIGNED:
+            return "SQL_DESC_UNSIGNED";
+        case SQL_DESC_UPDATABLE:
+            return "SQL_DESC_UPDATABLE";
+    }
+
+    return "unknown";
+}
+
+
 QString MYODBCC::getDriverCompletionString( SQLINTEGER nDriverCompletion )
 {
     switch ( nDriverCompletion )

Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/C/include/MYODBCC.h	2006-10-09 09:28:52 UTC (rev 583)
@@ -506,6 +506,7 @@
     /*@{*/
     static QString getConnectAttrString( SQLINTEGER nAttribute );
     static QString getConnectOptionString( SQLUSMALLINT nOption );
+    static QString getDescFieldString( SQLSMALLINT nField );
     static QString getDriverCompletionString( SQLINTEGER nDriverCompletion );
     static QString getDiagFieldString( SQLSMALLINT nDiagField );
     static QString getEnvAttrString( SQLINTEGER nAttribute );

Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -3403,8 +3403,8 @@
 
         Warn if bookmarks are meaningless to us.
     */
-    if ( getInfoBookmarkPersistence() == 0 )
-        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
+//    if ( getInfoBookmarkPersistence() == 0 )
+//        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
 
     MYODBCDbgReturn3( "%d", nUseBookmarks );
 }

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -16,6 +16,10 @@
 {
     MYODBCDbgEnter();
 
+#if MYODBC_DBG > 1
+    MYODBCDbgInfo( QString( "nFieldIdentifier=%1=%2" ).arg( nFieldIdentifier ).arg(
MYODBCC::getDescFieldString( nFieldIdentifier ) ) );
+#endif
+
     /*!
         \internal ODBC Rule
 

Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -672,6 +672,13 @@
 {
     MYODBCDbgEnter();
 
+#if MYODBC_DBG > 1
+    MYODBCDbgInfo( QString( "nState=%1=%2=%3 Custom Message=%4" ).arg( nState )
+                                               .arg(
pStates[MDiagnosticStatesXRef[nState][nODBCVersion]].stringSQLState )
+                                               .arg(
pStates[MDiagnosticStatesXRef[nState][nODBCVersion]].stringText )
+                                               .arg( stringMessage ) );
+#endif
+
     /* sanity checks */
     Q_ASSERT( nState < DIA_MAX );
 

Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -1073,8 +1073,9 @@
         setCursorType( CURSOR_TYPE_STATIC );
     }
 
-    if ( b )
-        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_01S02 ) );
+// PAH
+//    if ( b )
+//        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_01S02 ) );
     
     MYODBCDbgReturn( SQL_SUCCESS );
 }

Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2006-10-09 06:24:24 UTC (rev 582)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2006-10-09 09:28:52 UTC (rev 583)
@@ -1186,6 +1186,10 @@
 {
     MYODBCDbgEnter();
 
+#if MYODBC_DBG > 1
+    MYODBCDbgInfo( QString( "nColumnNumber=%1" ).arg( nFieldIdentifier ) );
+#endif
+
     SQLRETURN   nReturn;
     BOOLEAN     bHasInfo = false;
 
@@ -6299,8 +6303,8 @@
 
         Warn if bookmarks are meaningless to us.
     */
-    if ( getConnection()->getInfoBookmarkPersistence() == 0 )
-        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
+//    if ( getConnection()->getInfoBookmarkPersistence() == 0 )
+//        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
 
     MYODBCDbgReturn3( "%p", pFetchBookmarkPtr );
 }
@@ -6487,8 +6491,8 @@
 
         Warn if bookmarks are meaningless to us.
     */
-    if ( getConnection()->getInfoBookmarkPersistence() == 0 )
-        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
+//    if ( getConnection()->getInfoBookmarkPersistence() == 0 )
+//        getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
 
     MYODBCDbgReturn3( "%d", nUseBookmarks );
 }