Connector/ODBC 5 commit: r466 - trunk/MYSQLPlus/MYSQLPlusLib

[pharvey]

Modified:
   trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h
   trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h
   trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
Log:
added missing method for clean link

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp	2006-07-29 18:48:11 UTC (rev 465)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommand.cpp	2006-07-29 22:47:43 UTC (rev 466)
@@ -528,7 +528,7 @@
     MYODBCDbgReturn3( "%d", false );
 }
 
-MCommand MCommand::operator=( MCommand rval )
+MCommand &MCommand::operator=( const MCommand &rval )
 {
     pConnection             = rval.pConnection;
     pStatement              = rval.pStatement;

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h	2006-07-29 18:48:11 UTC (rev 465)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommand.h	2006-07-29 22:47:43 UTC (rev 466)
@@ -58,9 +58,13 @@
         COMMAND_TYPE_UNKNOWN        /*!< command starts with unknown keyword          
         */
     };
 
+    struct Null { };
+    static const Null null;
+
     MCommand( MConnection *pConnection );
     MCommand( MStatement *pStatement );
     MCommand();
+    inline MCommand( const Null & ) {}
 
     /* setters */
     SQLRETURN setCommand( const QString &stringCommand );   // this can include ODBC
and/or server specific syntax
@@ -84,7 +88,7 @@
     BOOLEAN isDataModificationPossible();
     BOOLEAN isServerSidePreparePossible();
 
-    MCommand operator=( MCommand rval );
+    MCommand &operator=( const MCommand &rval );
 
 protected:
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp	2006-07-29 18:48:11 UTC (rev 465)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp	2006-07-29 22:47:43 UTC (rev 466)
@@ -227,6 +227,11 @@
     MYODBCDbgReturn3( "%d", nPos );
 }
 
+const MCommand &MCommands::getCommand()
+{
+    return at( nPos );
+}
+
 BOOLEAN MCommands::doClear()
 {
     MYODBCDbgEnter();

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h	2006-07-29 18:48:11 UTC (rev 465)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommands.h	2006-07-29 22:47:43 UTC (rev 466)
@@ -54,11 +54,11 @@
     BOOLEAN     setPos( int nPos ); // set current command (0 based)
 
     /* getters */
-    QString     getCommands();          // simply returns the text provided to
setCommands()
-    QString     getNative();            // version of text which has any ODBC specifics
switched to server friendly syntax etc (prepared)
-    QList<int>  getParameterMarkers();  // list of index pos into native commands
string where we can find parameter marker ( '?' )
-    int         getPos();               // return current 
-    MCommand    getCommand();           // return current 
+    QString         getCommands();          // simply returns the text provided to
setCommands()
+    QString         getNative();            // version of text which has any ODBC
specifics switched to server friendly syntax etc (prepared)
+    QList<int>      getParameterMarkers();  // list of index pos into native
commands string where we can find parameter marker ( '?' )
+    int             getPos();               // return current 
+    const MCommand &getCommand();           // return current 
 
     /* doers */
     BOOLEAN doClear();

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-07-29 18:48:11 UTC (rev 465)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-07-29 22:47:43 UTC (rev 466)
@@ -3072,6 +3072,8 @@
 {
     MYODBCDbgEnter();
 
+    MCommand command;
+
     /*!
         \internal ODBC RULE
 
@@ -3184,7 +3186,8 @@
         Set SQL_DIAG_DYNAMIC_FUNCTION and SQL_DIAG_DYNAMIC_FUNCTION_CODE diagnostic
header fields and possibly use them instead
         of statement type.
     */
-    if ( pCommands->getCommand().isResultSetPossible() )
+    command = pCommands->getCommand();
+    if ( command.isResultSetPossible() )
         setState( STATE_S3 );
     else
         setState( STATE_S2 );
@@ -3532,7 +3535,8 @@
     if ( pCommands )
     {
         /* SQL or other command */
-        if ( pCommands->getCommand().isResultSetPossible() )
+        MCommand command = pCommands->getCommand();
+        if ( command.isResultSetPossible() )
         {
             qulonglong n;
             if ( pResult->getRows( &n ) == SQL_SUCCESS )
@@ -5353,7 +5357,8 @@
                     */
                     pCommands->doFirst();
 
-                    if ( pCommands->getCommand().isResultSetPossible() )
+                    MCommand command = pCommands->getCommand();
+                    if ( command.isResultSetPossible() )
                         nState = STATE_S3; // we will have a resultset
                 }
                 setState( nState );