Connector/ODBC 5 commit: r468 - in trunk: MYODBCIns/MYODBCInsLib MYODBCSetup/MYODBCSetupLib MYSQLPlus/MYSQLPlusLib

[pharvey]

Modified:
   trunk/MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
   trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupDataSourceDialog.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h
   trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h
   trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDiagnostic.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
Log:
- fixed asserts
- more progress on MCOmmands/MCommand cleanup

Modified: trunk/MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
===================================================================
--- trunk/MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp	2006-07-31 04:25:12 UTC (rev
467)
+++ trunk/MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp	2006-07-31 15:45:23 UTC (rev
468)
@@ -161,7 +161,7 @@
                 stringKeyword = QString::null;
                 break;
             default:
-                Q_ASSERT( 1 );
+                Q_ASSERT( 0 );
         }
 
         /* terminated a name/value pair */

Modified: trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupDataSourceDialog.cpp
===================================================================
--- trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupDataSourceDialog.cpp	2006-07-31 04:25:12
UTC (rev 467)
+++ trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupDataSourceDialog.cpp	2006-07-31 15:45:23
UTC (rev 468)
@@ -209,7 +209,7 @@
             setWindowTitle( "MySQL Connector/ODBC " MYODBC_VERSION " - View Data Source
Name" );
             break;
         default:
-            Q_ASSERT( 1 );
+            Q_ASSERT( 0 );
     }
 
     ptab1->setDataSourceName( pDataSource->getName() );

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -7,7 +7,6 @@
 */
 
 #include "MCommand.h"
-#include "MInternal.h"
 
 MCommand::MCommand( MCommands *pCommands )
     : QObject( pCommands, "MCommand" )
@@ -279,8 +278,6 @@
 {
     MYODBCDbgEnter();
 
-    pConnection = NULL;
-    pStatement  = NULL;
     nType       = COMMAND_TYPE_NULL;
     stringCommand.clear();
     stringNative.clear();
@@ -504,8 +501,6 @@
 
 MCommand &MCommand::operator=( const MCommand &rval )
 {
-    pConnection             = rval.pConnection;
-    pStatement              = rval.pStatement;
     stringCommand           = rval.stringCommand;
     stringNative            = rval.stringNative;
     listParameterMarkers    = rval.listParameterMarkers;
@@ -519,11 +514,11 @@
 {
     MYODBCDbgEnter();
 
-    MDiagnostic *pDiagnostic = pConnection->getDiagnostic();
+    MCommands *     pCommands = (MCommands*)parent();
+    Q_ASSERT( pCommands );
+    MDiagnostic *   pDiagnostic = pCommands->getDiagnostic();
+    Q_ASSERT( pDiagnostic );
 
-    if ( pStatement )
-        pDiagnostic = pStatement->getDiagnostic();
-
     MYODBCDbgReturn3( "%p", pDiagnostic );
 }
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h	2006-07-31 15:45:23 UTC (rev 468)
@@ -9,6 +9,8 @@
 #ifndef MCOMMAND_H
 #define MCOMMAND_H
 
+#include "MInternal.h"
+/*
 #include <MYODBCC.h>
 
 #include <QList>
@@ -18,8 +20,8 @@
 class MConnection;
 class MStatement;
 class MDiagnostic;
+*/
 
-
 /*!
     \brief  A single command (usually a SQL DDL/DML statement) to be sent to the server.
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -14,7 +14,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pConnection );
+    Q_ASSERT( pConnection );
     this->pConnection   = pConnection;
     pStatement          = NULL;
     nPos                = -1;
@@ -27,7 +27,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pStatement );
+    Q_ASSERT( pStatement );
     this->pStatement    = pStatement;
     pConnection         = pStatement->getConnection();
     nPos                = -1;
@@ -327,14 +327,30 @@
     MYODBCDbgReturn3( "%d", true );
 }
 
+MConnection *MCommands::getConnection()
+{
+}
+
+MStatement *MCommands::getStatement()
+{
+}
+
 MDiagnostic *MCommands::getDiagnostic()
 {
     MYODBCDbgEnter();
 
-    if ( pStatement )
-        MYODBCDbgReturn3( "%p", pStatement->getDiagnostic() );
+    MDiagnostic *   pDiagnostic = NULL;
+    MConnection *   pConnection;
+    MStatement *    pStatement;
 
-    MYODBCDbgReturn3( "%p", pConnection->getDiagnostic() );
+    if ( pStatement = getStatement() )
+        pDiagnostic = pStatement->getDiagnostic();
+    else if ( pConnection = getConnection() )
+        pDiagnostic = pConnection->getDiagnostic();
+
+    Q_ASSERT( pDiagnostic );
+
+    MYODBCDbgReturn3( "%p", pDiagnostic );
 }
 
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h	2006-07-31 15:45:23 UTC (rev 468)
@@ -45,6 +45,7 @@
 */
 class MCommands : public QObject
 {
+    friend class MCommand;
 public:
     MCommands( MConnection *pConnection );  /*!< Constructor for use by doNativeSQL().
                                         */
     MCommands( MStatement *pStatement );    /*!< Constructor for use by doPrepare().  
                                         */
@@ -75,6 +76,8 @@
     BOOLEAN setPos( int nPos );             /*!< Set current command (0 based).       
                                         */
 
     /* getters */
+    MConnection *   getConnection();
+    MStatement *    getStatement();
     MDiagnostic *   getDiagnostic();        /*!< The diagnostic we are going to use
(from connection or statement).             */
     int             getPos();               /*!< Return current command index.        
                                         */
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -28,7 +28,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pEnvironment );
+    Q_ASSERT( pEnvironment );
 
     pEnvironment->pDiagnostic->doClear();
 
@@ -81,7 +81,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( getState() > STATE_C2 );
+    Q_ASSERT( getState() <= STATE_C2 );
 
     /* QObject will delete our children */
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -38,7 +38,7 @@
     */
     setObjectName( "MDescriptor" );
 
-    Q_ASSERT( !pConnection );
+    Q_ASSERT( pConnection );
 
     pConnection->getDiagnostic()->doClear();
 
@@ -86,7 +86,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pStatement );
+    Q_ASSERT( pStatement );
 
     pDiagnostic = new MDiagnostic();
     nAllocType  = SQL_DESC_ALLOC_AUTO;

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -17,7 +17,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pDescriptor );
+    Q_ASSERT( pDescriptor );
 
     nConciseType        = SQL_C_DEFAULT;
     pDataPtr            = NULL;

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp	2006-07-31 04:25:12 UTC (rev
467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp	2006-07-31 15:45:23 UTC (rev
468)
@@ -16,7 +16,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pDescriptor );
+    Q_ASSERT( pDescriptor );
 
     MYODBCDbgReturn2();
 }

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp	2006-07-31 04:25:12 UTC (rev
467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp	2006-07-31 15:45:23 UTC (rev
468)
@@ -16,7 +16,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pDescriptor );
+    Q_ASSERT( pDescriptor );
 
     MYODBCDbgReturn2();
 }

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp	2006-07-31 04:25:12 UTC (rev
467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp	2006-07-31 15:45:23 UTC (rev
468)
@@ -16,7 +16,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pDescriptor );
+    Q_ASSERT( pDescriptor );
 
     MYODBCDbgReturn2();
 }

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDiagnostic.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDiagnostic.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDiagnostic.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -585,8 +585,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getClassOrigin() );
 }
@@ -595,8 +595,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn3( "%d", ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getColumnNumber() );
 }
@@ -605,8 +605,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getConnectionName() );
 }
@@ -615,8 +615,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getMessageText() );
 }
@@ -625,8 +625,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber - 1]))->getMessage()
);
 }
@@ -635,8 +635,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn3( "%d", ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getNative() );
 }
@@ -645,8 +645,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn3( "%d", ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getRowNumber() );
 }
@@ -655,8 +655,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getServerName() );
 }
@@ -665,8 +665,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getSQLState() );
 }
@@ -675,8 +675,8 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( nRecNumber < 1 );
-    Q_ASSERT( nRecNumber > getNumber() );
+    Q_ASSERT( nRecNumber >= 1 );
+    Q_ASSERT( nRecNumber <= getNumber() );
 
     MYODBCDbgReturn1( ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getSubClassOrigin() );
 }
@@ -755,7 +755,7 @@
     MYODBCDbgEnter();
 
     /* sanity checks */
-    Q_ASSERT( nState >= DIA_MAX );
+    Q_ASSERT( nState < DIA_MAX );
 
     MDiagnosticRecord *pDiagnosticRecord = new MDiagnosticRecord( this, nState );
     pDiagnosticRecord->setNative( nNative );

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -28,9 +28,9 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pDiagnostic );
-    Q_ASSERT( nState < 0 );
-    Q_ASSERT( nState >= DIA_MAX );
+    Q_ASSERT( pDiagnostic );
+    Q_ASSERT( nState >= 0 );
+    Q_ASSERT( nState < DIA_MAX );
 
     this->nState        = nState;
     nColumnNumber       = SQL_NO_COLUMN_NUMBER;

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -39,7 +39,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( getState() > STATE_E1 );
+    Q_ASSERT( getState() <= STATE_E1 );
 
     /* QObject will delete our children */
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -109,7 +109,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pStatement );
+    Q_ASSERT( pStatement );
 
     nState          = STATE_UNINITIALIZED;
     bBuffered       = true;

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -103,7 +103,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnColumns );
+    Q_ASSERT( pnColumns );
 
     *pnColumns = getImpRowDesc()->getCount();
 
@@ -138,7 +138,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnRow );
+    Q_ASSERT( pnRow );
 
     *pnRow = nRow;
 
@@ -152,7 +152,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnRows );
+    Q_ASSERT( pnRows );
 
     *pnRows = listResults.count();
 
@@ -375,7 +375,7 @@
 
     MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Resultset is read-only.") ) );
 /*
-    Q_ASSERT( !isValidRow() );
+    Q_ASSERT( isValidRow() );
 
     nRow--;
     listResults.removeAt( nRow );
@@ -499,7 +499,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( nRows == 0 );
+    Q_ASSERT( nRows != 0 );
 
     resultGetData.doClear();
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -145,7 +145,7 @@
     if ( getState() < STATE_EXECUTED ) 
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010, 0,
tr("MYSQL_RES based resultsets must be executed to getColumns()") ) );
 
-    Q_ASSERT( !pnColumns );
+    Q_ASSERT( pnColumns );
 
     *pnColumns = getImpRowDesc()->getCount();
 
@@ -271,7 +271,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnRow );
+    Q_ASSERT( pnRow );
 
     *pnRow = nRow;
 
@@ -302,7 +302,7 @@
     if ( !isBuffered() )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("getRows() not supported for unbuffered resultset") ) );
 
-    Q_ASSERT( !pnRows );
+    Q_ASSERT( pnRows );
 
     /*!
         \internal MYSQL RULE
@@ -1022,7 +1022,7 @@
             break;
 
         default:
-            Q_ASSERT( true );
+            Q_ASSERT( 0 );
     }
 
     /* recurse to roll-back more as needed */

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -196,7 +196,7 @@
     if ( getState() < STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnColumns );
+    Q_ASSERT( pnColumns );
 
     *pnColumns = getImpRowDesc()->getCount();
 
@@ -335,7 +335,7 @@
     if ( getState() < STATE_EXECUTED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
 
-    Q_ASSERT( !pnRow );
+    Q_ASSERT( pnRow );
 
     *pnRow = nRow;
 
@@ -366,7 +366,7 @@
     if ( !isBuffered() )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("getRows() not supported for unbuffered resultset") ) );
 
-    Q_ASSERT( !pnRows );
+    Q_ASSERT( pnRows );
 
     /*!
         \internal MYSQL RULE
@@ -1061,7 +1061,7 @@
             break;
 
         default:
-            Q_ASSERT( true );
+            Q_ASSERT( 0 );
     }
 
     /* recurse to roll-back more as needed */

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-07-31 04:25:12 UTC (rev 467)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-07-31 15:45:23 UTC (rev 468)
@@ -28,7 +28,7 @@
 {
     MYODBCDbgEnter();
 
-    Q_ASSERT( !pConnection );
+    Q_ASSERT( pConnection );
 
     pConnection->pDiagnostic->doClear();
 
@@ -2322,7 +2322,7 @@
     if ( isExecuted() )
         doStateRollBack( STATE_S3 );
 
-    Q_ASSERT( !pResult );
+    Q_ASSERT( pResult );
     SQLRETURN nReturn = pResult->doExecute();
     if ( !SQL_SUCCEEDED( nReturn ) )
     {
@@ -5319,7 +5319,7 @@
         case STATE_S3:
             setImplicitPrepare( false );
             /* cleanup resultset (we always have one here) */
-            Q_ASSERT( !pResult );
+            Q_ASSERT( pResult );
             delete pResult;
             pResult = NULL;
             /* cleanup commands (catalog calls do not have one) */
@@ -5370,7 +5370,7 @@
             break;
 
         default:
-            Q_ASSERT( true );
+            Q_ASSERT( 0 );
     }
 
     /* recurse to roll-back more as needed */