Fixes #150

driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryBuilder.java

@@ -7,6 +7,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -69,15 +70,18 @@ private String fillParameters(Map<String, Object> parameters) {
     if (params.size() > 0) {
       whereBuilder.append(" WHERE ");
       boolean first[] = { true };
+
+      AtomicInteger paramNum = new AtomicInteger();
       params.entrySet().forEach((e) -> {
-        String cond = formatCondition(e.getKey(), e.getValue());
+        String param = "param" + paramNum.getAndIncrement();
+        String cond = formatCondition(e.getKey(), param, e.getValue());
         if (first[0]) {
           whereBuilder.append(" " + cond);
           first[0] = false;
         } else {
           whereBuilder.append(" AND " + cond);
         }
-        parameters.put(e.getKey(), e.getValue().getValue());
+        parameters.put(param, e.getValue().getValue());
       });
     }
     return whereBuilder.toString();
@@ -107,8 +111,14 @@ protected String buildSingleQuery(String clazz, String whereCondition) {
     return String.format("SELECT FROM `%s` %s", clazz, whereCondition);
   }
 
-  private String formatCondition(String field, P<?> predicate) {
-    return String.format(" `%s` %s :%s", field, formatPredicate(predicate), field);
+  private String formatCondition(String field, String param, P<?> predicate) {
+
+    if (T.id.getAccessor().equalsIgnoreCase(field)) {
+      return String.format(" %s %s :%s", "@rid", formatPredicate(predicate), param);
+    } else {
+      return String.format(" `%s` %s :%s", field, formatPredicate(predicate), param);
+    }
+
   }
 
   private String formatPredicate(P<?> cond) {

driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryTest.java

@@ -107,6 +107,31 @@ public void shouldCountVerticesEdgesOnTXRollback() {
 
   }
 
+  @Test
+  public void shouldExecuteTraversalWithSpecialCharacters() {
+
+    OrientGraph graph = factory.getTx();
+
+    // Count on V
+    Long count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(0), count);
+
+    graph.addVertex("identifier", 1);
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(1), count);
+
+    graph.tx().commit();
+
+    count = graph.traversal().V().has("~identifier", 1).count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+    graph.close();
+
+  }
+
   @Test
   public void shouldNotBlowWithWrongClass() {
 
@@ -116,7 +141,6 @@ public void shouldNotBlowWithWrongClass() {
 
       initGraph(graph);
 
-
       Integer count = graph.traversal().V().hasLabel("Wrong").toList().size();
 
       Assert.assertEquals(new Integer(0), count);
@@ -132,6 +156,32 @@ public void shouldNotBlowWithWrongClass() {
 
   }
 
+  @Test
+  public void hasIdWithString() {
+    final String labelVertex = "VertexLabel";
+    OrientGraph graph = factory.getTx();
+    Vertex v1 = graph.addVertex(labelVertex);
+
+    graph.tx().commit();
+
+    Assert.assertEquals(1, graph.traversal().V().hasId(v1.id()).toList().size());
+
+    graph.close();
+  }
+
+  @Test
+  public void hasIdWithVertex() {
+    final String labelVertex = "VertexLabel";
+    OrientGraph graph = factory.getTx();
+    Vertex v1 = graph.addVertex(labelVertex);
+
+    graph.tx().commit();
+
+    Assert.assertEquals(1, graph.traversal().V().hasId(v1).toList().size());
+
+    graph.close();
+  }
+
   @Test
   public void shouldCountVerticesEdgesOnTXCommit() {
 

server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphQueryTest.java

@@ -0,0 +1,232 @@
+package com.orientechnologies.tinkerpop;
+
+import org.apache.tinkerpop.gremlin.orientdb.OrientGraph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Created by Enrico Risa on 11/08/2017.
+ */
+public class OrientGraphQueryTest extends AbstractRemoteGraphFactoryTest {
+
+  @Test
+  public void shouldCountVerticesEdges() {
+
+    OrientGraph graph = factory.getNoTx();
+
+    initGraph(graph);
+
+    // Count on V
+    Long count = graph.traversal().V().count().toList().get(0);
+    Assert.assertEquals(new Long(4), count);
+
+    count = graph.traversal().V().hasLabel("Person").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    count = graph.traversal().V().hasLabel("Animal").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    count = graph.traversal().V().hasLabel("Animal", "Person").count().toList().get(0);
+    Assert.assertEquals(new Long(4), count);
+
+    // Count on E
+
+    count = graph.traversal().E().count().toList().get(0);
+    Assert.assertEquals(new Long(3), count);
+
+    count = graph.traversal().E().hasLabel("HasFriend").count().toList().get(0);
+    Assert.assertEquals(new Long(1), count);
+
+    count = graph.traversal().E().hasLabel("HasAnimal").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    count = graph.traversal().E().hasLabel("HasAnimal", "HasFriend").count().toList().get(0);
+    Assert.assertEquals(new Long(3), count);
+
+    // Inverted Count
+
+    count = graph.traversal().V().hasLabel("HasFriend").count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+    count = graph.traversal().E().hasLabel("Person").count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+    // More Complex Count
+
+    count = graph.traversal().V().has("Person", "name", "Jon").out("HasFriend", "HasAnimal").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    // With Polymorphism
+
+    count = graph.traversal().V().has("Person", "name", "Jon").out("E").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    // With Base Class V/E
+
+    count = graph.traversal().V().has("name", "Jon").count().toList().get(0);
+    Assert.assertEquals(new Long(1), count);
+
+    count = graph.traversal().E().has("name", "Jon").count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+    count = graph.traversal().V().has("name", "Jon").out("E").count().toList().get(0);
+    Assert.assertEquals(new Long(2), count);
+
+    count = graph.traversal().E().has("marker", 10).count().toList().get(0);
+    Assert.assertEquals(new Long(1), count);
+
+    count = graph.traversal().V().has("marker", 10).count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+  }
+
+  @Test
+  public void shouldCountVerticesEdgesOnTXRollback() {
+
+    OrientGraph graph = factory.getTx();
+
+    // Count on V
+    Long count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(0), count);
+
+    graph.addVertex("name", "Jon");
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(1), count);
+
+    graph.tx().rollback();
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(0), count);
+
+    graph.close();
+
+  }
+
+  @Test
+  public void shouldExecuteTraversalWithSpecialCharacters() {
+
+    OrientGraph graph = factory.getTx();
+
+    // Count on V
+    Long count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(0), count);
+
+    graph.addVertex("identifier", 1);
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(1), count);
+
+    graph.tx().commit();
+
+    count = graph.traversal().V().has("~identifier", 1).count().toList().get(0);
+    Assert.assertEquals(new Long(0), count);
+
+    graph.close();
+
+  }
+
+  @Test
+  public void shouldNotBlowWithWrongClass() {
+
+    OrientGraph graph = factory.getNoTx();
+
+    try {
+
+      initGraph(graph);
+
+      Integer count = graph.traversal().V().hasLabel("Wrong").toList().size();
+
+      Assert.assertEquals(new Integer(0), count);
+
+      // Count on Person + Wrong Class
+
+      count = graph.traversal().V().hasLabel("Person", "Wrong").toList().size();
+
+      Assert.assertEquals(new Integer(2), count);
+    } finally {
+      graph.close();
+    }
+
+  }
+
+  @Test
+  public void hasIdWithString() {
+    final String labelVertex = "VertexLabel";
+    OrientGraph graph = factory.getTx();
+    Vertex v1 = graph.addVertex(labelVertex);
+
+    graph.tx().commit();
+
+    Assert.assertEquals(1, graph.traversal().V().hasId(v1.id()).toList().size());
+
+    graph.close();
+  }
+
+  @Test
+  public void hasIdWithVertex() {
+    final String labelVertex = "VertexLabel";
+    OrientGraph graph = factory.getTx();
+    Vertex v1 = graph.addVertex(labelVertex);
+
+    graph.tx().commit();
+
+    Assert.assertEquals(1, graph.traversal().V().hasId(v1).toList().size());
+
+    graph.close();
+  }
+
+  @Test
+  public void shouldCountVerticesEdgesOnTXCommit() {
+
+    OrientGraph graph = factory.getTx();
+
+    // Count on V
+    Long count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(0), count);
+
+    graph.addVertex("name", "Jon");
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(1), count);
+
+    graph.tx().commit();
+
+    count = graph.traversal().V().count().toList().get(0);
+
+    Assert.assertEquals(new Long(1), count);
+
+    graph.close();
+
+  }
+
+  protected void initGraph(OrientGraph graph) {
+
+    graph.createVertexClass("Person");
+    graph.createVertexClass("Animal");
+    graph.createEdgeClass("HasFriend");
+    graph.createEdgeClass("HasAnimal");
+
+    Vertex v1 = graph.addVertex(T.label, "Person", "name", "Jon");
+    Vertex v2 = graph.addVertex(T.label, "Person", "name", "Frank");
+
+    v1.addEdge("HasFriend", v2);
+
+    Vertex v3 = graph.addVertex(T.label, "Animal", "name", "Foo");
+    Vertex v4 = graph.addVertex(T.label, "Animal", "name", "Bar");
+
+    v1.addEdge("HasAnimal", v3, "marker", 10);
+    v2.addEdge("HasAnimal", v4);
+
+  }
+
+}