Connector/ODBC 5 commit: r194 - MYSQLPlus/MYSQLPlusLib MYSQLPlus/include doc/Project

[pharvey]

Added:
   doc/Project/SituationReport-20060512.ods
Removed:
   doc/Project/SituationReport.ods
Modified:
   MYSQLPlus/MYSQLPlusLib/MStatement.cpp
   MYSQLPlus/include/MStatement.h
   doc/Project/SituationReport-20060505.ods
Log:


Modified: MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-06 13:22:44 UTC (rev 193)
+++ MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-06 13:46:13 UTC (rev 194)
@@ -45,7 +45,6 @@
     MYODBCDbgReturn2();
 }
 
-
 SQLRETURN MStatement::setCursorName( SQLWCHAR *psCursorName, SQLSMALLINT nNameLength )
 {
     MYODBCDbgEnter();
@@ -170,85 +169,39 @@
 
         case SQL_ATTR_QUERY_TIMEOUT:
             MYODBCDbgReturn( setQueryTimeout( SQLUINTEGER)pValue ) );
-+++++++++
+
         case SQL_ATTR_RETRIEVE_DATA:
-            if ( pUnsignedInt != SQL_RD_DEFAULT )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
-            break;
+            MYODBCDbgReturn( setRetrieveData( (SQLUINTEGER)pValue ) );
 
         case SQL_ATTR_ROW_ARRAY_SIZE:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_row_desc, -1,
SQL_DESC_ARRAY_SIZE, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowArraySize( (SQLUINTEGER)pValue ) );
 
-        case SQL_ROWSET_SIZE:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_row_desc, -1,
SQL_DESC_ARRAY_SIZE, pValue, nStringLength ) );
-
         case SQL_ATTR_ROW_BIND_OFFSET_PTR:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_row_desc, -1,
SQL_DESC_BIND_OFFSET_PTR, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowBindOffsetPtr( (SQLINTEGER*)pValue ) );
 
         case SQL_ATTR_ROW_BIND_TYPE:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_row_desc, -1,
SQL_DESC_BIND_TYPE, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowBindType( (SQLUINTEGER)pValue ) );
 
         case SQL_ATTR_ROW_NUMBER:
-            MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
+            MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY092 ) );
 
         case SQL_ATTR_ROW_OPERATION_PTR:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_row_desc, -1,
SQL_DESC_ARRAY_STATUS_PTR, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowOperationPtr( (SQLUSMALLINT*)pValue ) );
 
         case SQL_ATTR_ROW_STATUS_PTR:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_imp_row_desc, -1,
SQL_DESC_ARRAY_STATUS_PTR, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowStatusPtr( (SQLUSMALLINT*)pValue ) );
 
         case SQL_ATTR_ROWS_FETCHED_PTR:
-            MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_imp_row_desc, -1,
SQL_DESC_ROWS_PROCESSED_PTR, pValue, nStringLength ) );
+            MYODBCDbgReturn( setRowsFetchedPtr( (SQLUINTEGER*)pValue ) );
 
         case SQL_ATTR_SIMULATE_CURSOR:
-            /*!
-                \internal ODBC RULE
+            MYODBCDbgReturn( setRowsFetchedPtr( (SQLUINTEGER*)pValue ) );
 
-                The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, 
-                or SQL_ATTR_USE_BOOKMARKS, and the cursor was open.
-            */
-            if ( getState() == STATE_S6 || getState() == STATE_S7 )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_24000 ) );
-
-            /*!
-                \internal ODBC RULE (DM)
-
-                The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, or 
-                SQL_ATTR_USE_BOOKMARKS, and the statement was prepared.            
-            */
-            if ( getState() >= STATE_S2 )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY011 ) );
-
-            if ( pUnsignedInt != SQL_SC_TRY_UNIQUE )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
-            break;
-
         case SQL_ATTR_USE_BOOKMARKS:
-            /*!
-                \internal ODBC RULE
+            MYODBCDbgReturn( setUseBookmarks( (SQLUINTEGER)pValue )  );
 
-                The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, 
-                or SQL_ATTR_USE_BOOKMARKS, and the cursor was open.
-            */
-            if ( getState() == STATE_S6 || getState() == STATE_S7 )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_24000 ) );
-
-            /*!
-                \internal ODBC RULE (DM)
-
-                The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, or 
-                SQL_ATTR_USE_BOOKMARKS, and the statement was prepared.            
-            */
-            if ( getState() >= STATE_S2 )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY011 ) );
-
-            if ( pUnsignedInt != pStm->attr_use_bookmarks )
-                MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
-            break;
-
         default:
-            MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_01000, 0,
"Attribute unknown & ignored." ) );
-            /* MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY092 ) ); */
+            MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY092 ) );
     }
 
     MYODBCDbgReturn( SQL_SUCCESS );
@@ -1124,15 +1077,6 @@
     MYODBCDbgReturn( pAppRowDesc->setBindType( nRowBindType ) );
 }
 
-SQLRETURN MStatement::setRowNumber( SQLUINTEGER nRowNumber )
-{
-    MYODBCDbgEnter();
-
-    this->nRowNumber = nRowNumber;
-
-    MYODBCDbgReturn( SQL_SUCCESS );
-}
-
 SQLRETURN MStatement::setRowOperationPtr( SQLUSMALLINT *pnRowOperationPtr )
 {
     MYODBCDbgEnter();
@@ -1158,6 +1102,24 @@
 {
     MYODBCDbgEnter();
 
+    /*!
+        \internal ODBC RULE
+
+        The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, 
+        or SQL_ATTR_USE_BOOKMARKS, and the cursor was open.
+    */
+    if ( getState() == STATE_S6 || getState() == STATE_S7 )
+        MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_24000 ) );
+
+    /*!
+        \internal ODBC RULE (DM)
+
+        The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, or 
+        SQL_ATTR_USE_BOOKMARKS, and the statement was prepared.            
+    */
+    if ( getState() >= STATE_S2 )
+        MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY011 ) );
+
     switch ( nSimulateCursor )
     {
         case SQL_SC_NON_UNIQUE:
@@ -1177,6 +1139,24 @@
 {
     MYODBCDbgEnter();
 
+    /*!
+        \internal ODBC RULE
+
+        The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, 
+        or SQL_ATTR_USE_BOOKMARKS, and the cursor was open.
+    */
+    if ( getState() == STATE_S6 || getState() == STATE_S7 )
+        MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_24000 ) );
+
+    /*!
+        \internal ODBC RULE (DM)
+
+        The Attribute was SQL_ATTR_CONCURRENCY, SQL_ATTR_CURSOR_TYPE,
SQL_ATTR_SIMULATE_CURSOR, or 
+        SQL_ATTR_USE_BOOKMARKS, and the statement was prepared.            
+    */
+    if ( getState() >= STATE_S2 )
+        MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY011 ) );
+
     switch ( nUseBookmarks )
     {
         case SQL_UB_OFF:

Modified: MYSQLPlus/include/MStatement.h
===================================================================
--- MYSQLPlus/include/MStatement.h	2006-05-06 13:22:44 UTC (rev 193)
+++ MYSQLPlus/include/MStatement.h	2006-05-06 13:46:13 UTC (rev 194)
@@ -103,7 +103,6 @@
     SQLRETURN setRowArraySize( SQLUINTEGER nRowArraySize );                 /*!<
SQL_ATTR_ROW_ARRAY_SIZE = ARD->SQL_DESC_ARRAY_SIZE                 */
     SQLRETURN setRowBindOffsetPtr( SQLINTEGER *pnRowBindOffsetPtr );        /*!<
SQL_ATTR_ROW_BIND_OFFSET_PTR = ARD->SQL_DESC_BIND_OFFSET_PTR       */
     SQLRETURN setRowBindType( SQLUINTEGER nRowBindType );                   /*!<
SQL_ATTR_ROW_BIND_TYPE = ARD->SQL_DESC_BIND_TYPE                   */
-    SQLRETURN setRowNumber( SQLUINTEGER nRowNumber );                       /*!<
SQL_ATTR_ROW_NUMBER                                                */
     SQLRETURN setRowOperationPtr( SQLUSMALLINT *pnRowOperationPtr );        /*!<
SQL_ATTR_ROW_OPERATION_PTR = ARD->SQL_DESC_ARRAY_STATUS_PTR        */ 
     SQLRETURN setRowStatusPtr( SQLUSMALLINT *pnRowStatusPtr );              /*!<
SQL_ATTR_ROW_STATUS_PTR = IRD->SQL_DESC_ARRAY_STATUS_PTR           */ 
     SQLRETURN setRowsFetchedPtr( SQLUINTEGER *pnRowsFetchedPtr );           /*!<
SQL_ATTR_ROWS_FETCHED_PTR = IRD->SQL_DESC_ROWS_PROCESSED_PTR       */ 
@@ -176,7 +175,7 @@
     SQLUINTEGER     nNoscan;                /*!< SQL_ATTR_NOSCAN                      
 */
     SQLUINTEGER     nQueryTimeout;          /*!< SQL_ATTR_QUERY_TIMEOUT               
 */
     SQLUINTEGER     nRetrieveData;          /*!< SQL_ATTR_RETRIEVE_DATA               
 */
-    SQLUINTEGER     nRowNumber;             /*!< SQL_ATTR_ROW_NUMBER                  
 */
+/*  SQLUINTEGER     nRowNumber; */          /*!< SQL_ATTR_ROW_NUMBER                  
 */
     SQLUINTEGER     nSimulateCursor;        /*!< SQL_ATTR_SIMULATE_CURSOR             
 */
     SQLUINTEGER     nUseBookmarks;          /*!< SQL_ATTR_USE_BOOKMARKS               
 */
 };

Modified: doc/Project/SituationReport-20060505.ods
===================================================================
(Binary files differ)

Added: doc/Project/SituationReport-20060512.ods
===================================================================
(Binary files differ)


Property changes on: doc/Project/SituationReport-20060512.ods
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: doc/Project/SituationReport.ods
===================================================================
(Binary files differ)