Fix for escaped characters in strings?

engine/src/main/grammar/SQLGrammar.jjt

@@ -425,13 +425,22 @@ TOKEN :
   < STRING_LITERAL:
     (
       "\""
-      (~["\n","\r","\""])*
+      ( (~["\n","\r","\"","\\"])
+      | ("\\"
+          ( ["n","t","b","r","f","\\","\"","/","%","?"])
+        )
+      )*
       "\""
     )
     |
     (
       "'"
-      (~["'"])* "'" ("'" (~["'"])* "'")*
+      ( (~["\n","\r","'","\\"])
+      | ("\\"
+          ( ["n","t","b","r","f","\\","'","/","%","?"])
+        )
+      )*
+      "'"
     )
   >
   |

engine/src/main/java/com/arcadedb/query/sql/parser/SqlParser.java

@@ -298,7 +298,8 @@ final public List<Statement> ParseScript() throws ParseException {/*@bgen(jjtree
         case ROLLBACK:
         case IF:
         case SLEEP:
-        case FOREACH:{
+        case FOREACH:
+        case SEMICOLON:{
           break;
           }
         default:
@@ -325,6 +326,10 @@ final public List<Statement> ParseScript() throws ParseException {/*@bgen(jjtree
 result.add(last);
             break;
             }
+          case SEMICOLON:{
+            jj_consume_token(SEMICOLON);
+            break;
+            }
           default:
             jj_la1[4] = jj_gen;
             jj_consume_token(-1);
@@ -18060,6 +18065,75 @@ private boolean jj_2_146(int xla)
     finally { jj_save(145, xla); }
   }
 
+  private boolean jj_3_73()
+ {
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_150()
+ {
+    if (jj_3R_332()) return true;
+    Token xsp;
+    if (jj_3R_333()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_333()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_828()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_835()) {
+    jj_scanpos = xsp;
+    if (jj_3R_836()) {
+    jj_scanpos = xsp;
+    if (jj_3R_837()) {
+    jj_scanpos = xsp;
+    if (jj_3R_838()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(171)) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_835()
+ {
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_836()
+ {
+    if (jj_3R_262()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_333()
+ {
+    if (jj_scan_token(SC_OR)) return true;
+    if (jj_3R_332()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_837()
+ {
+    if (jj_3R_815()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_838()
+ {
+    if (jj_3R_814()) return true;
+    return false;
+  }
+
   private boolean jj_3_145()
  {
     if (jj_3R_63()) return true;
@@ -19870,13 +19944,6 @@ private boolean jj_3R_492()
     return false;
   }
 
-  private boolean jj_3R_580()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_123()) return true;
-    return false;
-  }
-
   private boolean jj_3R_137()
  {
     Token xsp;
@@ -19891,6 +19958,13 @@ private boolean jj_3R_137()
     return false;
   }
 
+  private boolean jj_3R_580()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
   private boolean jj_3_1()
  {
     if (jj_scan_token(249)) return true;
@@ -19911,13 +19985,6 @@ private boolean jj_3R_493()
     return false;
   }
 
-  private boolean jj_3R_581()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_123()) return true;
-    return false;
-  }
-
   private boolean jj_3_2()
  {
     if (jj_3R_62()) return true;
@@ -19926,6 +19993,13 @@ private boolean jj_3_2()
     return false;
   }
 
+  private boolean jj_3R_581()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
   private boolean jj_3R_305()
  {
     if (jj_scan_token(LBRACE)) return true;
@@ -19970,6 +20044,12 @@ private boolean jj_3R_764()
     return false;
   }
 
+  private boolean jj_3R_808()
+ {
+    if (jj_3R_62()) return true;
+    return false;
+  }
+
   private boolean jj_3R_169()
  {
     if (jj_3R_123()) return true;
@@ -19979,12 +20059,6 @@ private boolean jj_3R_169()
     return false;
   }
 
-  private boolean jj_3R_808()
- {
-    if (jj_3R_62()) return true;
-    return false;
-  }
-
   private boolean jj_3R_809()
  {
     if (jj_3R_133()) return true;
@@ -26174,75 +26248,6 @@ private boolean jj_3_72()
     return false;
   }
 
-  private boolean jj_3_73()
- {
-    if (jj_3R_151()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_150()
- {
-    if (jj_3R_332()) return true;
-    Token xsp;
-    if (jj_3R_333()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_333()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_828()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_835()) {
-    jj_scanpos = xsp;
-    if (jj_3R_836()) {
-    jj_scanpos = xsp;
-    if (jj_3R_837()) {
-    jj_scanpos = xsp;
-    if (jj_3R_838()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(171)) return true;
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_835()
- {
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_836()
- {
-    if (jj_3R_262()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_333()
- {
-    if (jj_scan_token(SC_OR)) return true;
-    if (jj_3R_332()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_837()
- {
-    if (jj_3R_815()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_838()
- {
-    if (jj_3R_814()) return true;
-    return false;
-  }
-
   /** Generated Token Manager. */
   public SqlParserTokenManager token_source;
   /** Current token. */
@@ -26288,7 +26293,7 @@ private static void jj_la1_init_4() {
 	   jj_la1_4 = new int[] {0xc000,0x0,0x400fdf,0x20,0x20,0x8000,0xfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8440bfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0xfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x0,0x8440bfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8440bfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8440bfdf,0x0,0x0,0x0,0x0,0x400000,0xfdf,0x0,0x8440bfdf,0x0,0x8440bfdf,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8440bfdf,0x80008000,0x8440bfdf,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0xfdf,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x8440bfdf,0x0,0x0,0x0,0x0,0x0,0x80008fdf,0x0,0x8440bfdf,0x0,0x8440bfdf,0x0,0x8440bfdf,0x0,0x0,0x8440bfdf,0x0,0x8440bfdf,0x80008000,0x0,0x402fdf,0x0,0x0,0x0,0x402fdf,0x0,0x0,0x402fdf,0x0,0x0,0x402fdf,0x0,0x0,0x0,0x402fdf,0x0,0x0,0x402fdf,0x0,0x0,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x0,0x8440bfdf,0x8000afdf,0x0,0x8000afdf,0x8000afdf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x580,0x400fdf,0x0,0x0,0x580,0xfdf,0x0,0xfdf,0x0,0xfdf,0x0,0xfdf,0x0,0x0,0xfdf,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0x400fdf,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x0,0xfdf,0x0,0x0,0x0,0x2fdf,0x0,0x0,0x0,0x2fdf,0x0,0x0,0xfdf,0xfdf,0x0,0x0,0xfdf,0xfdf,0x0,0x0,0xfdf,0xfdf,0x0,0x0,0xfdf,0xfdf,0x0,0x0,0x0,0x400fdf,0x0,0x0,0x0,0x8440bfdf,0x20,0x20,0x20,0x20,0x20,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_5() {
-	   jj_la1_5 = new int[] {0x0,0x80,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x200,0x0,0x0,0x0,0x0,0x0,0x1000,0x80,0x2000000,0x2000000,0x0,0x1000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x80,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x1000,0x1000,0x0,0x2200,0x20000,0x2200,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x1000,0x1000,0x1000,0x1000,0x1000,0x3000080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x3000000,0x0,0x1000,0x1000,0x0,0x400000,0x2000000,0x0,0x1000,0x400000,0x0,0x34002b9,0x2000000,0x0,0x1000,0x0,0x3000006,0x0,0x1000,0x30002b9,0x1000,0x30002b9,0x0,0x0,0x200,0x2000,0x18,0x80,0x40000000,0x18,0x80,0x0,0x30002b9,0x1,0x3000201,0x1000,0x20,0x1000,0x3000000,0x2001000,0x2001000,0x80,0x200,0x3000020,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x30002b9,0x18,0xbc3e0000,0x60000,0x0,0xbc3e0000,0x1,0x1000,0x30002b9,0x1000,0x30002b9,0x1000,0x30002b9,0xbc3e0000,0x0,0x3000221,0x0,0x3000221,0x3000001,0x2200,0x80,0x0,0x0,0x2200,0x80,0x0,0x0,0xa0,0x1000,0x2200,0x80,0x0,0x0,0x2200,0x80,0x0,0x0,0xa0,0x1000,0x1000,0x3000000,0x3000000,0x3000000,0x0,0x0,0x0,0x1000,0x30002b9,0x1,0x1000,0x1,0x1,0x102000,0x100000,0x2000,0x80,0x80,0x80,0x80,0x100000,0x80,0x1000,0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x1000,0x80,0x280,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x3000000,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30002b9,0x800,0x800,0x800,0x800,0x800,0x800,0x1000,0x0,0x0,0x18,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,};
+	   jj_la1_5 = new int[] {0x0,0x80,0x0,0x800,0x800,0x1,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x200,0x0,0x0,0x0,0x0,0x0,0x1000,0x80,0x2000000,0x2000000,0x0,0x1000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x80,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34002b9,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x1000,0x1000,0x0,0x2200,0x20000,0x2200,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x1000,0x1000,0x1000,0x1000,0x1000,0x3000080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x3000000,0x0,0x1000,0x1000,0x0,0x400000,0x2000000,0x0,0x1000,0x400000,0x0,0x34002b9,0x2000000,0x0,0x1000,0x0,0x3000006,0x0,0x1000,0x30002b9,0x1000,0x30002b9,0x0,0x0,0x200,0x2000,0x18,0x80,0x40000000,0x18,0x80,0x0,0x30002b9,0x1,0x3000201,0x1000,0x20,0x1000,0x3000000,0x2001000,0x2001000,0x80,0x200,0x3000020,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x30002b9,0x18,0xbc3e0000,0x60000,0x0,0xbc3e0000,0x1,0x1000,0x30002b9,0x1000,0x30002b9,0x1000,0x30002b9,0xbc3e0000,0x0,0x3000221,0x0,0x3000221,0x3000001,0x2200,0x80,0x0,0x0,0x2200,0x80,0x0,0x0,0xa0,0x1000,0x2200,0x80,0x0,0x0,0x2200,0x80,0x0,0x0,0xa0,0x1000,0x1000,0x3000000,0x3000000,0x3000000,0x0,0x0,0x0,0x1000,0x30002b9,0x1,0x1000,0x1,0x1,0x102000,0x100000,0x2000,0x80,0x80,0x80,0x80,0x100000,0x80,0x1000,0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x1000,0x80,0x280,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x3000000,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30002b9,0x800,0x800,0x800,0x800,0x800,0x800,0x1000,0x0,0x0,0x18,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,};
 	}
 	private static void jj_la1_init_6() {
 	   jj_la1_6 = new int[] {0x0,0x0,0x10000008,0x0,0x0,0x0,0x10000000,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000010,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x8,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x10000018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf000,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10000018,0x0,0x0,0x0,0x6000000,0x0,0x10000000,0x0,0x10000018,0x0,0x10000018,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1800f7c,0x10000018,0x0,0x10000018,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x18000018,0x0,0x20000000,0x0,0x8000000,0x38000000,0x10000000,0x0,0x10000018,0x0,0x10000018,0x0,0x10000018,0xa0000000,0x0,0x10000018,0x0,0x10000018,0x0,0x0,0x10000008,0x0,0x0,0x0,0x10000008,0x0,0x0,0x10000008,0x0,0x0,0x10000008,0x0,0x0,0x0,0x10000008,0x0,0x0,0x10000008,0x0,0x0,0x8,0x8,0x8,0x0,0x0,0x0,0x0,0x10000018,0x10000000,0x0,0x10000000,0x10000000,0xa,0x0,0x0,0x0,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0x10000008,0x0,0x0,0x0,0x10000000,0xa,0x10000000,0xa,0x10000000,0xa,0x10000000,0xa,0x0,0x10000000,0xa,0x0,0x10000000,0xa,0x0,0x0,0x0,0x10000008,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0xc,0xc,0xc,0x0,0xc,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000010,0x10000010,0x0,0x0,0x10,0x10000008,0x0,0x0,0x0,0x10000018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};