Fix parsing of MATCH statement in console

Resolves: #8414
orientechnologies · Jul 19, 2018 · 6832971 · 6832971
1 parent 3111a61
commit 6832971
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/core/src/main/java/com/orientechnologies/common/console/OConsoleCommandStream.java b/core/src/main/java/com/orientechnologies/common/console/OConsoleCommandStream.java
@@ -132,7 +132,7 @@ public String nextCommand() {
           case RIGHT_BRAKET:
             result.append(c);
             nestingLevel--;
-            if (nestingLevel <= 0) {
+            if (nestingLevel <= 0 && !isMatch(result)) {
               return result.toString().trim();
             }
             break;
@@ -266,6 +266,17 @@ public String nextCommand() {
     }
   }
 
+  private boolean isMatch(StringBuilder result) {
+    String cmd = result.toString().trim();
+    if (cmd.length() < 6) {
+      return false;
+    }
+    if (cmd.substring(0, 6).equalsIgnoreCase("match ")) {
+      return true;
+    }
+    return false;
+  }
+
   @Override
   public void close() {
     try {