Fix CREATE EDGE to take into account useClassForEdgeLabel and useVert…

…exFieldsForEdgeLabels flags

graphdb/src/main/java/com/orientechnologies/orient/graph/sql/OCommandExecutorSQLCreateEdge.java

@@ -30,23 +30,11 @@
 import com.orientechnologies.orient.core.exception.OConcurrentModificationException;
 import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
-import com.orientechnologies.orient.core.sql.OCommandExecutorSQLRetryAbstract;
-import com.orientechnologies.orient.core.sql.OCommandParameters;
-import com.orientechnologies.orient.core.sql.OCommandSQLParsingException;
-import com.orientechnologies.orient.core.sql.OSQLEngine;
-import com.orientechnologies.orient.core.sql.OSQLHelper;
+import com.orientechnologies.orient.core.sql.*;
 import com.orientechnologies.orient.core.sql.functions.OSQLFunctionRuntime;
-import com.tinkerpop.blueprints.impls.orient.OrientBaseGraph;
-import com.tinkerpop.blueprints.impls.orient.OrientEdge;
-import com.tinkerpop.blueprints.impls.orient.OrientEdgeType;
-import com.tinkerpop.blueprints.impls.orient.OrientGraph;
-import com.tinkerpop.blueprints.impls.orient.OrientVertex;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.tinkerpop.blueprints.impls.orient.*;
+
+import java.util.*;
 
 /**
  * SQL CREATE EDGE command.
@@ -60,6 +48,7 @@ public class OCommandExecutorSQLCreateEdge extends OCommandExecutorSQLRetryAbstr
   private String                      from;
   private String                      to;
   private OClass                      clazz;
+  private String                      edgeLabel;
   private String                      clusterName;
   private List<OPair<String, Object>> fields;
   private int                         batch         = 100;
@@ -85,7 +74,8 @@ public OCommandExecutorSQLCreateEdge parse(final OCommandRequest iRequest) {
 
       String className = null;
 
-      String temp = parseOptionalWord(true);
+      String tempLower = parseOptionalWord(false);
+      String temp = tempLower == null ? null : tempLower.toUpperCase();
 
       while (temp != null) {
         if (temp.equals("CLUSTER")) {
@@ -113,8 +103,13 @@ public OCommandExecutorSQLCreateEdge parse(final OCommandRequest iRequest) {
             batch = Integer.parseInt(temp);
 
         } else if (className == null && temp.length() > 0) {
-          className = temp;
-          clazz = ((OMetadataInternal) database.getMetadata()).getImmutableSchemaSnapshot().getClass(className);
+          className = tempLower;
+          OrientBaseGraph graph = OrientBaseGraph.getActiveGraph();
+          if (graph != null && graph.isUseClassForEdgeLabel()) {
+            clazz = ((OMetadataInternal) database.getMetadata()).getImmutableSchemaSnapshot().getClass(temp);
+          } else {
+            clazz = ((OMetadataInternal) database.getMetadata()).getImmutableSchemaSnapshot().getClass("E");
+          }
         }
 
         temp = parseOptionalWord(true);
@@ -132,6 +127,7 @@ public OCommandExecutorSQLCreateEdge parse(final OCommandRequest iRequest) {
       if (clazz == null)
         throw new OCommandSQLParsingException("Class '" + className + "' was not found");
 
+      edgeLabel = className;
     } finally {
       textRequest.setText(originalQuery);
     }
@@ -186,7 +182,7 @@ public List<Object> call(OrientBaseGraph graph) {
                     fields = OPair.convertFromMap(content.toMap());
                 }
 
-                edge = fromVertex.addEdge(null, toVertex, clsName, clusterName, fields);
+                edge = fromVertex.addEdge(null, toVertex, edgeLabel, clusterName, fields);
 
                 if (fields != null && !fields.isEmpty()) {
                   if (edge.isLightweight())

graphdb/src/test/java/com/orientechnologies/orient/graph/sql/TestGraphCreateEdgeWithoutClass.java

@@ -0,0 +1,63 @@
+package com.orientechnologies.orient.graph.sql;
+
+import com.orientechnologies.orient.core.record.impl.ODocument;
+import com.orientechnologies.orient.core.sql.OCommandSQL;
+import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
+import com.tinkerpop.blueprints.impls.orient.OrientElement;
+import com.tinkerpop.blueprints.impls.orient.OrientGraph;
+import com.tinkerpop.blueprints.impls.orient.OrientVertex;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class TestGraphCreateEdgeWithoutClass {
+
+  @Test
+  public void testCreateEdgeWithoutClass() {
+    OrientGraph graph = new OrientGraph("memory:" + TestGraphCreateEdgeWithoutClass.class.getSimpleName());
+    graph.setUseClassForEdgeLabel(false);
+    graph.setUseVertexFieldsForEdgeLabels(true);
+    try {
+
+
+
+      OrientVertex test = graph.addVertex("class:V");
+      test.setProperty("name", "foo");
+      test.save();
+      OrientVertex test1 = graph.addVertex("class:V");
+      test1.setProperty("name", "bar");
+      test1.save();
+      graph.commit();
+      graph
+          .command(new OCommandSQL(
+              "create edge FooBar from (select from V where name='foo') to (select from V where name = 'bar')"))
+          .execute();
+      graph.commit();
+
+      Iterable<OrientElement> res = graph
+          .command(
+              new OSQLSynchQuery("select out as f1, out_ as f2, out_edgetestedge as f3, out_FooBar as f4, outE() as f5 from v where name = 'foo'"))
+          .execute();
+
+
+      boolean found = false;
+      for (OrientElement oDocument : res) {
+        assertNull(oDocument.getRecord().field("f1"));
+        assertNull(oDocument.getRecord().field("f2"));
+        assertNull(oDocument.getRecord().field("f3"));
+        assertNotNull(oDocument.getRecord().field("f4"));
+        Iterable<ODocument> f5 = oDocument.getRecord().field("f5");
+        assertNotNull(f5);
+        for(ODocument e:f5) {
+          assertEquals(e.field("label"), "FooBar");
+          found = true;
+        }
+      }
+      assertTrue(found);
+
+    } finally {
+      graph.drop();
+    }
+  }
+
+}