Move createUniquenessConstraint procedure to community

neo4j · Jun 9, 2018 · 5eca23a · 5eca23a
1 parent 323849e
commit 5eca23a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 18 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java
@@ -236,6 +236,21 @@ public Stream<SchemaIndexInfo> createIndex(
         }
     }
 
+    @Description( "Create a unique property constraint with index backed by specified index provider " +
+            "(for example: CALL db.createUniquePropertyConstraint(\":Person(name)\", \"lucene+native-2.0\")) - " +
+            "YIELD index, providerName, status" )
+    @Procedure( name = "db.createUniquePropertyConstraint", mode = SCHEMA )
+    public Stream<BuiltInProcedures.SchemaIndexInfo> createUniquePropertyConstraint(
+            @Name( "index" ) String index,
+            @Name( "providerName" ) String providerName )
+            throws ProcedureException
+    {
+        try ( IndexProcedures indexProcedures = indexProcedures() )
+        {
+            return indexProcedures.createUniquePropertyConstraint( index, providerName );
+        }
+    }
+
     @Description( "Get node from explicit index. Replaces `START n=node:nodes(key = 'A')`" )
     @Procedure( name = "db.index.explicit.seekNodes", mode = READ )
     public Stream<NodeResult> nodeManualIndexSeek( @Name( "indexName" ) String explicitIndexName,

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java
@@ -327,6 +327,12 @@ public void shouldListCorrectBuiltinProcedures() throws Throwable
                 record( "db.createIndex",
                         "db.createIndex(index :: STRING?, providerName :: STRING?) :: (index :: STRING?, providerName :: STRING?, status :: STRING?)",
                         "Create a schema index with specified index provider (for example: CALL db.createIndex(\":Person(name)\", \"lucene+native-2.0\")) - " +
+                                "YIELD index, providerName, status", "SCHEMA" ),
+                record( "db.createUniquePropertyConstraint",
+                        "db.createUniquePropertyConstraint(index :: STRING?, providerName :: STRING?) :: " +
+                                "(index :: STRING?, providerName :: STRING?, status :: STRING?)",
+                        "Create a unique property constraint with index backed by specified index provider " +
+                                "(for example: CALL db.createUniquePropertyConstraint(\":Person(name)\", \"lucene+native-2.0\")) - " +
                                 "YIELD index, providerName, status", "SCHEMA" )
         ) );
     }

diff --git a/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java b/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java
@@ -266,7 +266,13 @@ public void listProcedures() throws Throwable
                         "Create a schema index with specified index provider (for example: CALL db.createIndex(\":Person(name)\", \"lucene+native-2.0\")) - " +
                                 "YIELD index, providerName, status",
                         "SCHEMA"
-                } )
+                } ),
+                equalTo( new Object[]{"db.createUniquePropertyConstraint",
+                        "db.createUniquePropertyConstraint(index :: STRING?, providerName :: STRING?) :: " +
+                                "(index :: STRING?, providerName :: STRING?, status :: STRING?)",
+                        "Create a unique property constraint with index backed by specified index provider " +
+                                "(for example: CALL db.createUniquePropertyConstraint(\":Person(name)\", \"lucene+native-2.0\")) - " +
+                                "YIELD index, providerName, status", "SCHEMA"} )
         ) );
         commit();
     }

diff --git a/...nity/lucene-index/src/test/java/org/neo4j/kernel/builtinprocs/CreateIndexProcedureIT.java b/...nity/lucene-index/src/test/java/org/neo4j/kernel/builtinprocs/CreateIndexProcedureIT.java
@@ -21,8 +21,11 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.StringJoiner;
 import java.util.concurrent.TimeUnit;
 
@@ -56,8 +59,18 @@
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE10;
 import static org.neo4j.values.storable.Values.stringValue;
 
+@RunWith( Parameterized.class )
 public class CreateIndexProcedureIT extends KernelIntegrationTest
 {
+    @Parameterized.Parameters( name = "{1}")
+    public static Collection<Object[]> parameters()
+    {
+        return Arrays.asList(
+                new Object[]{ true, "createIndex", "index created" }
+                new Object[]{ false, "createUniquePropertyConstraint", "uniqueness constraint online" },
+        );
+    }
+
     @Test
     public void createIndexWithGivenProvider() throws KernelException
     {

diff --git a/...l/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInProcedures.java b/...l/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInProcedures.java
@@ -43,21 +43,6 @@ public class EnterpriseBuiltInProcedures
     @Context
     public DependencyResolver resolver;
 
-    @Description( "Create a unique property constraint with index backed by specified index provider " +
-            "(for example: CALL db.createUniquePropertyConstraint(\":Person(name)\", \"lucene+native-2.0\")) - " +
-            "YIELD index, providerName, status" )
-    @Procedure( name = "db.createUniquePropertyConstraint", mode = SCHEMA )
-    public Stream<BuiltInProcedures.SchemaIndexInfo> createUniquePropertyConstraint(
-            @Name( "index" ) String index,
-            @Name( "providerName" ) String providerName )
-            throws ProcedureException
-    {
-        try ( IndexProcedures indexProcedures = indexProcedures() )
-        {
-            return indexProcedures.createUniquePropertyConstraint( index, providerName );
-        }
-    }
-
     @Description( "Create a node key constraint with index backed by specified index provider " +
             "(for example: CALL db.createNodeKey(\":Person(name)\", \"lucene+native-2.0\")) - " +
             "YIELD index, providerName, status" )

diff --git a/...erprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java b/...erprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java
@@ -51,8 +51,7 @@ public class EnterpriseCreateIndexProcedureIT extends CreateIndexProcedureIT
     public static Collection<Object[]> parameters()
     {
         return Arrays.asList(
-                new Object[]{ false, "createUniquePropertyConstraint", "uniqueness constraint online" },
+                (Object[][]) new Object[]{true, "createNodeKey", "node key constraint online"}
-                new Object[]{ true, "createNodeKey", "node key constraint online" }
         );
     }