Fix comment detection

arkanovicz · Apr 25, 2022 · 5d5dc6d · 5d5dc6d
1 parent 040a194
commit 5d5dc6d
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/modality-core/src/main/java/com/republicate/modality/sql/SqlUtils.java b/modality-core/src/main/java/com/republicate/modality/sql/SqlUtils.java
@@ -184,12 +184,13 @@ public static List<String> splitStatements(String query, Character identifierQuo
         Stack<SplitState> state = new Stack<>();
         state.push(SplitState.NORMAL);
         int dollars = 0;
-        boolean afterHyphen = false;
+        Character c = null, prevChar = null;
         int parLevel = 0;
         StringBuilder currentQuery = new StringBuilder();
         for (int i = 0; i < query.length(); ++i)
         {
-            Character c = query.charAt(i);
+            prevChar = c;
+            c = query.charAt(i);
             if(state.peek() != SplitState.COMMENT) currentQuery.append(c);
             switch (state.peek())
             {
@@ -199,16 +200,11 @@ public static List<String> splitStatements(String query, Character identifierQuo
                     {
                         case '-':
                         {
-                            if (afterHyphen)
+                            if (prevChar != null && prevChar == '-')
                             {
-                                afterHyphen = false;
                                 state.push(SplitState.COMMENT);
                                 currentQuery.delete(currentQuery.length() - 2, currentQuery.length());
                             }
-                            else
-                            {
-                                afterHyphen = true;
-                            }
                             break;
                         }
                         case '\'':