Fixed #27: SqlScriptReader is parsing string literals from comments.

JumpMind · May 16, 2016 · b365ce2 · b365ce2
1 parent 6203190
commit b365ce2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScriptReader.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScriptReader.java
@@ -140,8 +140,9 @@ private final String removeComments(String s) {
         char prev = '\0';
         int index = 0;
         for (char cur : characters) {
-
-            literalInfo = switchLiteral(literalInfo, index, characters);
+            if (!inLineComment) {
+                literalInfo = switchLiteral(literalInfo, index, characters);
+            }
 
             if (literalInfo == null && !inLineComment && !inBlockComment) {
                 inBlockComment = isBlockCommentStart(prev, cur);
@@ -227,7 +228,9 @@ private final boolean checkStatementEnds(String s) {
         char prev = '\0';
         int index = 0;        
         for (char cur : characters) {
-            literalInfo = switchLiteral(literalInfo, index, characters);
+            if (!inLineComment) {
+                literalInfo = switchLiteral(literalInfo, index, characters);
+            }
 
             if (literalInfo == null && !inLineComment && !inBlockComment) {
                 inBlockComment = isBlockCommentStart(prev, cur);

diff --git a/symmetric-db/src/test/resources/test-script-1.sql b/symmetric-db/src/test/resources/test-script-1.sql
@@ -19,6 +19,8 @@
 -- under the License.
 --
 
+-- This is a comment with a single literal. It's
+
 -- This is a comment
 select * from 
   TEST where