added support to DELETE EDGE [rid1, ridN] (multiple RIDs as a target …

…for delete edge)
orientechnologies · Mar 9, 2015 · 6d99108 · 6d99108
1 parent 5e964ae
commit 6d99108
Show file tree

Hide file tree

Showing 4 changed files with 1,573 additions and 1,459 deletions.
diff --git a/core/src/main/grammar/OrientSQL.jjt b/core/src/main/grammar/OrientSQL.jjt
@@ -664,7 +664,26 @@ ODeleteEdgeStatement DeleteEdgeByRidStatement():
 (
 	<DELETE>
 	<EDGE>
-	jjtThis.rid = Rid()
+	(
+	    jjtThis.rid = Rid()
+	    |
+	    (
+
+	        <LBRACKET>
+            [
+                lastRid = Rid()
+                {
+                    jjtThis.rids = new ArrayList();
+                    jjtThis.rids.add(lastRid);
+                }
+                (
+                    <COMMA>
+                    lastRid = Rid() { jjtThis.rids.add(lastRid); }
+                )*
+            ] <RBRACKET>
+	    )
+	)
+
 
 ) {return jjtThis;}
 }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteEdgeStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteEdgeStatement.java
@@ -12,6 +12,7 @@ public class ODeleteEdgeStatement extends OStatement {
   protected OIdentifier       targetClusterName;
 
   protected ORid              rid;
+  protected List<ORid>        rids;
 
   protected ORid              leftRid;
   protected List<ORid>        leftRids;
@@ -58,11 +59,22 @@ public String toString() {
       }
     }
 
-
     if (rid != null) {
       result.append(" ");
       result.append(rid.toString());
     }
+    if (rids != null) {
+      result.append("[");
+      boolean first = true;
+      for (ORid rid : rids) {
+        if (!first) {
+          result.append(", ");
+        }
+        result.append(rid.toString());
+        first = false;
+      }
+      result.append("]");
+    }
 
     if (leftRid != null || leftRids != null || leftStatement != null || leftParam != null || leftIdentifier != null) {
       result.append(" FROM ");
@@ -132,7 +144,6 @@ public String toString() {
       }
     }
 
-
     if (whereClause != null) {
       result.append(" WHERE ");
       result.append(whereClause.toString());