Connector/ODBC 5 commit: r220 - MYSQLPlus/MYSQLPlusLib

[pharvey]

Modified:
   MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
Log:


Modified: MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-05-10 16:50:09 UTC (rev 219)
+++ MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-05-10 17:00:47 UTC (rev 220)
@@ -39,7 +39,7 @@
 {
     MYODBCDbgEnter();
 
-    doStateRollBack( STATE_UNINITALIZED );
+    doStateRollBack( STATE_UNINITIALIZED );
 
     MYODBCDbgReturn2();
 }
@@ -66,6 +66,9 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
+    if ( isReadOnly() )
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010, 0,
tr("Resultset is read-only.") ) );
+
     if ( !isValidRow() )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
"Invalid row." ) );
 
@@ -550,6 +553,13 @@
 SQLRETURN MResultStmt::doAppend()
 {
     MYODBCDbgEnter();
+
+    if ( getState() < STATE_EXECUTED )
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
+
+    if ( isReadOnly() )
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010, 0,
tr("Resultset is read-only.") ) );
+
     MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "doAppend
not supported here at this time." ) );
 }
 
@@ -597,6 +607,9 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
+    if ( isReadOnly() )
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010, 0,
tr("Resultset is read-only.") ) );
+
     MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "doDelete
not supported here at this time." ) );
 }
 
@@ -701,6 +714,9 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
+    if ( isReadOnly() )
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010, 0,
tr("Resultset is read-only.") ) );
+
     MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "doInsert
not supported here at this time." ) );
 }
 
@@ -818,18 +834,18 @@
     if ( mysql_stmt_prepare( pstm, stringStatement, stringStatement.length() ) )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000,
mysql_stmt_errno( pstm ), mysql_stmt_error( pstm ) ) );
 
+    setState( STATE_PREPARED );
+
     /* get result-set meta-data */
     nReturn = doLoadMetaData();
     if ( !SQL_SUCCEEDED( nReturn ) )
     {
-        setState( STATE_PREPARED );          /* Move state forward...                */
-        doStateRollBack( STATE_INITIALZED ); /* ...so this call will do a cleanup.   */
+        doStateRollBack( STATE_INITIALIZED ); /* ...so this call will do a cleanup.   */
         MYODBCDbgReturn( nReturn );
     }
 
     /* now we are prepared */
     this->stringStatement = stringStatement;
-    setState( STATE_PREPARED );
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }