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

[pharvey]

Modified:
   trunk/SDK/Installer/Library/MYODBCIns.cpp
   trunk/SDK/MYSQLPlus/Library/MConnection.cpp
Log:
FIX: Revert changes to parse attributes string - does not work correctly as noted by ';'
being left upon ends of some values. Also; possibly cause of some crashs.

Modified: trunk/SDK/Installer/Library/MYODBCIns.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCIns.cpp	2006-10-12 02:36:38 UTC (rev 595)
+++ trunk/SDK/Installer/Library/MYODBCIns.cpp	2006-10-12 04:19:07 UTC (rev 596)
@@ -218,9 +218,7 @@
                 /* end of value? */
                 if ( nState == PARSE_STATE_VALUE )
                 {
-                    /* more chars if it's not the last char or delimiter */
-                    if ( nScanChar + 1 < stringKeywordValues.length() && 
-                            !isDelim( stringKeywordValues, nScanChar, &nDelim ) )
+                    if ( !isDelim( stringKeywordValues, nScanChar, &nDelim ) )
                         break;
                 }
                 else if ( nState == PARSE_STATE_VALUE_BRACED )
@@ -271,13 +269,6 @@
                 if ( phashKeywordValues->contains( stringKeyword ) )
                     break;
 
-                /*
-                    increment nScanChar if this is the last char and not null
-                    so mid() is given the right length
-                */
-                if( nScanChar + 1 == stringKeywordValues.length() && 
-                        stringKeywordValues[nScanChar].unicode() != 0 )
-                    nScanChar++;
                 phashKeywordValues->insert( stringKeyword, stringKeywordValues.mid(
nAnchorChar, nScanChar - nAnchorChar ) );
                 stringKeyword = QString::null;
                 break;
@@ -286,14 +277,14 @@
                 MYODBCDbgReturn3( "%d", false );
         }
 
-        /* have we advanced to end of string */
-        if ( isDelimKeywordValues( stringKeywordValues, nScanChar, nDelim ) )
-            break;
-
         /* terminated a name/value pair */
         if ( isDelimKeywordValue( stringKeywordValues[nScanChar], &nDelim ) )
             nState = PARSE_STATE_NAME_START;
 
+        /* have we advanced to end of string */
+        if ( isDelimKeywordValues( stringKeywordValues, nScanChar, nDelim ) )
+            break;
+
         nScanChar++;
 
     } /* while scan */
@@ -615,9 +606,6 @@
 {
     MYODBCDbgEnter();
 
-    if( nScanChar + 1 >= stringKeywordValues.length() )
-        MYODBCDbgReturn3( "%d", true );
-
     switch ( nDelim )
     {
         case DELIM_BOTH:

Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2006-10-12 02:36:38 UTC (rev 595)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2006-10-12 04:19:07 UTC (rev 596)
@@ -4750,15 +4750,7 @@
 SQLUSMALLINT MConnection::getInfoOdbcApiConformance()
 {
     MYODBCDbgEnter();
-
-// PAH - as per MS SQL
-//    MYODBCDbgReturn3( "%d", SQL_OAC_LEVEL2 );
-
-// PAH - as per C/ODBC v3
-//    MYODBCDbgReturn3( "%d", SQL_OAC_LEVEL1 );
-
-// PAH - downgrade for testing
-    MYODBCDbgReturn3( "%d", SQL_OAC_NONE /* SQL_OAC_CORE */ );
+    MYODBCDbgReturn3( "%d", SQL_OAC_LEVEL1 );
 }
 
 SQLUINTEGER  MConnection::getInfoOdbcInterfaceConformance()