Properly format node key constraints

community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/IndexBackedConstraintDescriptor.java

@@ -52,11 +52,16 @@ public String prettyPrint( TokenNameLookup tokenNameLookup )
     {
         String labelName = escapeLabelOrRelTyp( tokenNameLookup.labelGetName( schema.getLabelId() ) );
         String nodeName = labelName.toLowerCase();
-        String properties = SchemaUtil.niceProperties( tokenNameLookup, schema.getPropertyIds(), nodeName + ".",
-                schema().getPropertyIds().length > 1 );
-        return String.format( "CONSTRAINT ON ( %s:%s ) ASSERT %s IS %s", nodeName, labelName, properties,
+
+        return String.format( "CONSTRAINT ON ( %s:%s ) ASSERT %s IS %s", nodeName, labelName,
+                formatProperties( schema.getPropertyIds(), tokenNameLookup, nodeName ),
                 constraintTypeText() );
     }
 
     protected abstract String constraintTypeText();
+
+    protected String formatProperties( int[] propertyIds, TokenNameLookup tokenNameLookup, String nodeName )
+    {
+        return SchemaUtil.niceProperties( tokenNameLookup, propertyIds, nodeName + ".", propertyIds.length > 1 );
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/NodeKeyConstraintDescriptor.java

@@ -20,7 +20,9 @@
 package org.neo4j.kernel.api.schema.constraints;
 
 
+import org.neo4j.internal.kernel.api.TokenNameLookup;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
+import org.neo4j.internal.kernel.api.schema.SchemaUtil;
 
 public class NodeKeyConstraintDescriptor extends IndexBackedConstraintDescriptor
 {
@@ -34,4 +36,9 @@ protected String constraintTypeText()
     {
         return "NODE KEY";
     }
+
+    protected String formatProperties( int[] propertyIds, TokenNameLookup tokenNameLookup, String nodeName )
+    {
+        return SchemaUtil.niceProperties( tokenNameLookup, propertyIds, nodeName + ".", true );
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/NodeKeyConstraintDefinition.java

@@ -48,7 +48,7 @@ public ConstraintType getConstraintType()
     @Override
     public String toString()
     {
-        return format( "ON (%1$s:%2$s) ASSERT %3$s IS NODE KEY",
+        return format( "ON (%1$s:%2$s) ASSERT (%3$s) IS NODE KEY",
                 label.name().toLowerCase(), label.name(), propertyText() );
     }
 }

community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java

@@ -24,6 +24,7 @@
 import org.junit.Test;
 import org.mockito.stubbing.Answer;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -180,12 +181,14 @@ public void shouldListConstraints() throws Throwable
         // Given
         givenUniqueConstraint( "User", "name" );
         givenNodePropExistenceConstraint( "User", "name" );
-
+        givenNodeKeys( "User", "name" );
         // When/Then
         assertThat( call( "db.constraints" ),
-                contains(
+                containsInAnyOrder(
                         record( "CONSTRAINT ON ( user:User ) ASSERT exists(user.name)" ),
-                        record( "CONSTRAINT ON ( user:User ) ASSERT user.name IS UNIQUE" ) ) );
+                        record( "CONSTRAINT ON ( user:User ) ASSERT user.name IS UNIQUE" ),
+                        record( "CONSTRAINT ON ( user:User ) ASSERT (user.name) IS NODE KEY" )
+                ) );
     }
 
     @Test
@@ -454,6 +457,18 @@ private void givenNodePropExistenceConstraint( String label, String propKey )
         constraints.add( ConstraintDescriptorFactory.existsForLabel( labelId, propId ) );
     }
 
+    private void givenNodeKeys( String label, String...props )
+    {
+        int labelId = token( label, labels );
+        int[] propIds = new int[props.length];
+        for ( int i = 0; i < propIds.length; i++ )
+        {
+            propIds[i] = token( props[i], propKeys );
+        }
+
+        constraints.add( ConstraintDescriptorFactory.nodeKeyForLabel( labelId, propIds ) );
+    }
+
     private void givenPropertyKeys( String... keys )
     {
         for ( String key : keys )

enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/CompositeNodeKeyConstraintAcceptanceTest.scala

@@ -190,7 +190,7 @@ class CompositeNodeKeyConstraintAcceptanceTest extends ExecutionEngineFunSuite w
     failWithError(
       Configs.AbsolutelyAll - Configs.Before3_3AndRule,
       "CREATE CONSTRAINT ON (person:Person) ASSERT (person.name) IS NODE KEY",
-      List(("Unable to create CONSTRAINT ON ( person:Person ) ASSERT person.name IS NODE KEY:%s" +
+      List(("Unable to create CONSTRAINT ON ( person:Person ) ASSERT (person.name) IS NODE KEY:%s" +
         "Both Node(%d) and Node(%d) have the label `Person` and property `name` = 'A'").format(String.format("%n"), a, b))
     )
   }

enterprise/kernel/src/test/java/org/neo4j/shell/PECListingIT.java

@@ -154,7 +154,7 @@ public void shouldHaveCorrectIndentationsInSchemaListing() throws Exception
                 "  ON :Person\\(surname\\) ONLINE \\(for uniqueness constraint\\)",
                 "Constraints",
                 "  ON \\(person:Person\\) ASSERT person.name IS UNIQUE",
-                "  ON \\(person:Person\\) ASSERT person.surname IS NODE KEY",
+                "  ON \\(person:Person\\) ASSERT \\(person.surname\\) IS NODE KEY",
                 "  ON \\(person:Person\\) ASSERT exists\\(person.name\\)",
                 "  ON \\(\\)-\\[knows:KNOWS\\]-\\(\\) ASSERT exists\\(knows.since\\)" );
     }