Connector/ODBC 3.51 commit: r56 - myodbc3

[pharvey]

Modified:
   myodbc3/prepare.c
Log:
tweak to quoted parameter (note: we may not want quoted parameters after all)

Modified: myodbc3/prepare.c
===================================================================
--- myodbc3/prepare.c	2006-07-19 21:45:56 UTC (rev 55)
+++ myodbc3/prepare.c	2006-07-20 04:08:09 UTC (rev 56)
@@ -153,13 +153,19 @@
         /* parameter marker? */
         if (!in_string)
         {
-            if (*pos == '\'' || *pos == '"' || *pos == '`')   /* Start of string */
+            if (*pos == '\'' || *pos == '"' || *pos == '`') /* start of string? */
             {
-                if ( pos[1] == '?' && pos[2] == *pos )
+                if ( bParameterMarker ) /* are we closing quote for a parameter marker in
quotes? */
                 {
+                    bParameterMarker = 0;
+                    continue;
+                }
+                else if ( pos[1] == '?' && pos[2] == *pos ) /* are we opening
quote for parameter marker in quotes? */
+                {
                     bParameterMarker = 1;
+                    continue;
                 }
-                else
+                else /* we must be an opening quote for some text we want to ignore */
                 {
                     in_string= *pos;
                     continue;
@@ -168,7 +174,7 @@
             if (*pos == '?')
             {
                 PARAM_BIND *param;
-                bParameterMarker = 0;
+
                 if (param_count >= stmt->params.elements)
                 {
                     PARAM_BIND tmp_param;