[CONJ-618] Client prepared statement parsing double slash as comment …

…error
mariadb-corporation · Jun 18, 2018 · 8a4877e · 8a4877e
1 parent e9e8acc
commit 8a4877e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/dao/ClientPrepareResult.java b/src/main/java/org/mariadb/jdbc/internal/util/dao/ClientPrepareResult.java
@@ -237,11 +237,7 @@ public static boolean canAggregateSemiColon(String queryString, boolean noBacksl
                     break;
 
                 case '/':
-                    if (state == LexState.SlashStarComment && lastChar == '*') {
-                        state = LexState.Normal;
-                    } else if (state == LexState.Normal && lastChar == '/') {
-                        state = LexState.EOLComment;
-                    }
+                    if (state == LexState.SlashStarComment && lastChar == '*') state = LexState.Normal;
                     break;
 
                 case '#':
@@ -394,8 +390,6 @@ public static ClientPrepareResult rewritableParts(String queryString, boolean no
                     case '/':
                         if (state == LexState.SlashStarComment && lastChar == '*') {
                             state = LexState.Normal;
-                        } else if (state == LexState.Normal && lastChar == '/') {
-                            state = LexState.EOLComment;
                         }
                         break;
 

diff --git a/src/test/java/org/mariadb/jdbc/ClientPreparedStatementParsingTest.java b/src/test/java/org/mariadb/jdbc/ClientPreparedStatementParsingTest.java
@@ -84,10 +84,12 @@ private boolean checkParsing(String sql, int paramNumber, boolean rewritable, bo
     @Test
     public void stringEscapeParsing() throws Exception {
         assertTrue(checkParsing("select '\\'' as a, ? as b, \"\\\"\" as c, ? as d",
-                2, true, true,
+                2, false, true,
                 new String[]{
                         "select '\\'' as a, ",
+                        "",
                         " as b, \"\\\"\" as c, ",
+                        "",
                         " as d"},
                 new String[]{
                         "select '\\'' as a, ",