Connector/ODBC 5 commit: r777 - in trunk/SDK: Installer/Library MYSQLPlus/Library

[jbalint]

Modified:
   trunk/SDK/Installer/Library/MYODBCIns.cpp
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
Log:
fixed connection string parsing (mainly an issue with DSN-less)
fixed SQL_NUMERIC_C again

Modified: trunk/SDK/Installer/Library/MYODBCIns.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCIns.cpp	2007-01-24 07:30:28 UTC (rev 776)
+++ trunk/SDK/Installer/Library/MYODBCIns.cpp	2007-01-24 23:20:40 UTC (rev 777)
@@ -176,7 +176,6 @@
     /* scan the input (we can not use QString::split() due to possible use of {} to
embrace values and type of delim) */
     while ( 1 )
     {
-// printf( "[PAH][%s][%d] (%c)\n", __FILE__, __LINE__,
stringKeywordValues[nScanChar].toAscii() );
         switch ( nState )
         {
             case PARSE_STATE_NAME_START:
@@ -196,7 +195,6 @@
                     {
                         stringKeyword = stringKeywordValues.mid( nAnchorChar, nScanChar -
nAnchorChar );
                         nState = PARSE_STATE_VALUE_START;
-// printf( "[PAH][%s][%d] (%s)\n", __FILE__, __LINE__, stringKeyword.toAscii().data() );
                     }
                 }
                 break;
@@ -242,7 +240,8 @@
                 {
                     if ( isDelim( stringKeywordValues, nScanChar, &nDelim ) )
                     {
-                        setError( QString( "[%1][%2][ERROR] Missing closing brace for %3
value." ).arg( __FILE__ ).arg( __LINE__ ).arg( stringKeyword ) );
+                        setError( QString( "[%1][%2][ERROR] Missing closing brace for %3
value." )
+                                .arg( __FILE__ ).arg( __LINE__ ).arg( stringKeyword ) );
                         MYODBCDbgReturn3( "%d", false );
                     }
 
@@ -267,7 +266,7 @@
                 if ( phashKeywordValues->contains( stringKeyword ) )
                     break;
 
-                phashKeywordValues->insert( stringKeyword, stringValue );
+                phashKeywordValues->insert( stringKeyword.toUpper(), stringValue );
                 stringKeyword = QString::null;
                 break;
             default:

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-01-24 07:30:28 UTC (rev 776)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-01-24 23:20:40 UTC (rev 777)
@@ -1871,10 +1871,10 @@
     }
 
     QString stringValueToPack;
-    if ( stringlistData.size() )
-    	stringValueToPack = QString( stringlistData[0] + stringlistData[1] );
-	else
-    	stringValueToPack = stringlistData[0];
+    if ( stringlistData.size() == 2 )
+        stringValueToPack = QString( stringlistData[0] + stringlistData[1] );
+    else
+        stringValueToPack = stringlistData[0];
     ulonglong nValueToPack = stringValueToPack.toULongLong();
 
     /*!