Fixes issue krummas#45

Now handling backquotes the same way single and double quotes are handled
gilius38 · Apr 13, 2018 · 9ec434f · 9ec434f
1 parent b2ca26e
commit 9ec434f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>drizzle-jdbc</artifactId>
     <packaging>jar</packaging>
     <name>Drizzle-JDBC</name>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <description>BSD Licensed JDBC driver for Drizzle and MySQL</description>
     <url>https://github.com/krummas/DrizzleJDBC</url>
     <properties>

diff --git a/src/main/java/org/drizzle/jdbc/internal/common/Utils.java b/src/main/java/org/drizzle/jdbc/internal/common/Utils.java
@@ -150,26 +150,35 @@ public static int countChars(final String str, final char chr) {
     public static List<String> createQueryParts(String query) {
         boolean isWithinDoubleQuotes = false;
         boolean isWithinQuotes = false;
+	boolean isWithinBackquotes = false;
+
         int queryPos = 0;
         int lastQueryPos = 0;
         List<String> queryParts = new LinkedList<String>();
 
         for (int i = 0; i < query.length(); i++) {
             final char c = query.charAt(i);
 
-            if (c == '"' && !isWithinQuotes && !isWithinDoubleQuotes) {
+            if (c == '"' && !isWithinQuotes && !isWithinDoubleQuotes && !isWithinBackquotes) {
                 isWithinDoubleQuotes = true;
-            } else if (c == '"' && !isWithinQuotes) {
+            } else if (c == '"' && !isWithinQuotes && !isWithinBackquotes) {
                 isWithinDoubleQuotes = false;
             }
 
-            if (c == '\'' && !isWithinQuotes && !isWithinDoubleQuotes) {
+            if (c == '\'' && !isWithinQuotes && !isWithinDoubleQuotes && !isWithinBackquotes) {
                 isWithinQuotes = true;
-            } else if (c == '\'' && !isWithinDoubleQuotes) {
+            } else if (c == '\'' && !isWithinDoubleQuotes && !isWithinBackquotes) {
                 isWithinQuotes = false;
             }
 
-            if (!isWithinDoubleQuotes && !isWithinQuotes) {
+            if (c == '`' && !isWithinQuotes && !isWithinDoubleQuotes && !isWithinBackquotes) {
+                isWithinBackquotes = true;
+            } else if (c == '`' && !isWithinDoubleQuotes && !isWithinQuotes) {
+                isWithinBackquotes = false;
+            }
+
+
+            if (!isWithinDoubleQuotes && !isWithinQuotes && !isWithinBackquotes) {
                 if (c == '?') {
                     queryParts.add(query.substring(lastQueryPos, queryPos));
                     lastQueryPos = queryPos + 1;
@@ -498,4 +507,4 @@ public static long byteArrayToLong(byte [] b) {
         return isPositive?-sum:sum;
         //return Integer.MAX_VALUE;
     }
-}
+}