Connector/ODBC 5 commit: r273 - / MYSQLPlus/MYSQLPlusLib MYSQLPlus/MYSQLPlusTest

[pharvey]

Modified:
   MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
   MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
   MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
   connector-odbc.vpw
Log:


Modified: MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-05-26 17:45:13 UTC (rev 272)
+++ MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-05-26 18:25:45 UTC (rev 273)
@@ -418,17 +418,9 @@
     QByteArray bytearrayStatementWithParameters = bytearrayStatementTemplate;
 
     /* escape the works */
-    char *p = (char *)MYODBCC::getMem( bytearrayStatementWithParameters.count() * + 2 );
-    unsigned long n = mysql_real_escape_string( getMySQL(), p,
bytearrayStatementWithParameters.constData(), bytearrayStatementWithParameters.count() );
-
-    if ( mysql_real_query( getMySQL(), p, n ) )
-    {
-        MYODBCC::doFree( p );
+    if ( mysql_real_query( getMySQL(), bytearrayStatementWithParameters.constData(),
bytearrayStatementWithParameters.count() ) )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000,
mysql_errno( getMySQL() ), mysql_error( getMySQL() ) ) );
-    }
 
-    MYODBCC::doFree( p );
-
     /*!
         \internal
         \todo
@@ -1068,7 +1060,7 @@
     if ( !pField )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Invalid field structure. Failed to store field descriptor information.") ) );
 
-    if ( nField >= (unsigned int)getImpRowDesc()->getCount() )
+    if ( nField > (unsigned int)getImpRowDesc()->getCount() )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Field index out of range. Failed to store field descriptor information.") ) );
 
     /*

Modified: MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-05-26 17:45:13 UTC (rev 272)
+++ MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp	2006-05-26 18:25:45 UTC (rev 273)
@@ -1234,7 +1234,7 @@
     if ( !pField )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Invalid field structure. Failed to store field descriptor information.") ) );
 
-    if ( nField >= (unsigned int)getImpRowDesc()->getCount() )
+    if ( nField > (unsigned int)getImpRowDesc()->getCount() )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Field index out of range. Failed to store field descriptor information.") ) );
 
     /*

Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp	2006-05-26 17:45:13 UTC (rev 272)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp	2006-05-26 18:25:45 UTC (rev 273)
@@ -139,9 +139,21 @@
     SQLINTEGER  nStrLenOrInd;
 
     nReturn = statement.doExecDirect( TEXT("SELECT * FROM tbMyODBCTest"), SQL_NTS );
+    if ( nReturn != SQL_SUCCESS )
+    {
+        std::cout << endl;
+        std::cout << statement.getDiagnostics().join( "\n" ).toLatin1().data();
+        std::cout << endl;
+    }
     QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
 
     nReturn = statement.doRowCount( &nRows );
+    if ( nReturn != SQL_SUCCESS )
+    {
+        std::cout << endl;
+        std::cout << statement.getDiagnostics().join( "\n" ).toLatin1().data();
+        std::cout << endl;
+    }
     QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
     QCOMPARE( nRows, (SQLINTEGER)3 );
 

Modified: connector-odbc.vpw
===================================================================
--- connector-odbc.vpw	2006-05-26 17:45:13 UTC (rev 272)
+++ connector-odbc.vpw	2006-05-26 18:25:45 UTC (rev 273)
@@ -22,6 +22,7 @@
 		<Project File="MYODBCTst/MYODBCTst.vpj" />
 		<Project File="MYODBCTst/MYODBCTstLib/MYODBCTstLib.vpj" />
 		<Project File="../mysql-include.vpj" />
+		<Project File="../mysql.vpj" />
 		<Project File="MYSQLPlus/MYSQLPlus.vpj" />
 		<Project File="MYSQLPlus/MYSQLPlusLib/MYSQLPlusLib.vpj" />
 		<Project File="MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj" />