Connector/ODBC 5 commit: r336 - in trunk/MYSQLPlus: MYSQLPlusLib MYSQLPlusTest

[pharvey]

Modified:
   trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
   trunk/MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
Log:
- removing 'show stopper' issues for next alpha

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-14 20:34:48 UTC (rev 335)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-14 22:57:25 UTC (rev 336)
@@ -1589,12 +1589,11 @@
     }
     else
     {
-        if ( !pResultGetData->variantData.canConvert<long int>() ) 
+        if ( !pResultGetData->variantData.canConvert<qlonglong>() ) 
             MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
         *((long int *)pResultGetData->pTarget) = (long
int)pResultGetData->variantData.toLongLong();
     }
 
-
     pResultGetData->variantData.clear();
     if ( pResultGetData->pnBytesRemaining ) *pResultGetData->pnBytesRemaining = 0;
 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-06-14 20:34:48 UTC (rev 335)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp	2006-06-14 22:57:25 UTC (rev 336)
@@ -822,8 +822,11 @@
 
             stringStatementSegment += cChar;
         }
+        if ( !stringStatementSegment.isNull() )
+            stringlistStatement += stringStatementSegment;
     }
 
+
 //    bytearrayStatementTemplate  = stringStatement.toUtf8().data();
 
     setStatementType( stringStatement );

Modified: trunk/MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp	2006-06-14 20:34:48 UTC (rev 335)
+++ trunk/MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp	2006-06-14 22:57:25 UTC (rev 336)
@@ -207,6 +207,8 @@
     QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
     QCOMPARE( nRows, (SQLINTEGER)3 );
 
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
+
     nRows = 0;
     while ( 1 )
     {
@@ -218,6 +220,7 @@
 
         nRows++;
 
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
         nReturn = statement.getData( 1, SQL_C_LONG, &nUserID, 0, &nStrLenOrInd );
         if ( nReturn != SQL_SUCCESS )
             std::cout << endl << endl <<
statement.getDiagnostics().join( "\n" ).toAscii().data() << endl << endl;
@@ -226,6 +229,7 @@
 
         if ( nRows == 1 )
         {
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
             nReturn = statement.getData( 2, SQL_C_CHAR, &szName, 100,
&nStrLenOrInd );
             QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
             QVERIFY( nStrLenOrInd == 0 );
@@ -233,6 +237,7 @@
         }
         else if ( nRows == 2 )
         {
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
             nReturn = statement.getData( 2, SQL_C_WCHAR, &szNameWide, 100,
&nStrLenOrInd );
             QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
             QVERIFY( nStrLenOrInd == 0 );
@@ -240,6 +245,7 @@
         }
         else if ( nRows == 3 )
         {
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
             nReturn = statement.getData( 2, SQL_C_CHAR, &szName, 100,
&nStrLenOrInd );
             QCOMPARE( nReturn, (SQLRETURN)SQL_SUCCESS );
             QVERIFY( nStrLenOrInd == 0 );