From c534fc348857fc9bf960f50e0d485e8c00c2829c Mon Sep 17 00:00:00 2001
From: Mats Rydberg <mats@neotechnology.com>
Date: Tue, 16 Feb 2016 16:34:32 +0100
Subject: [PATCH] Add parsing of relationships

---
 .../feature/parser/CypherValuesCreator.java   |  60 +++-
 .../cypher/feature/parser/ParsedNode.java     |  16 +
 .../feature/parser/ParsedRelationship.java    | 169 +++++++++++
 .../generated/FeatureResultsBaseListener.java |  12 +
 .../generated/FeatureResultsListener.java     |  10 +
 .../generated/FeatureResultsParser.java       | 279 ++++++++++--------
 .../src/main/resources/FeatureResults.g4      |   4 +-
 .../feature/parser/ParsedEntities.scala       |  26 --
 .../parser/expectedResultsParserTest.scala    |  55 +++-
 9 files changed, 457 insertions(+), 174 deletions(-)
 create mode 100644 community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedRelationship.java
 delete mode 100644 community/cypher/compatibility-suite/src/main/scala/cypher/feature/parser/ParsedEntities.scala

diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/CypherValuesCreator.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/CypherValuesCreator.java
index ff87e9eb67b1..a9fa24bf3e34 100644
--- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/CypherValuesCreator.java
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/CypherValuesCreator.java
@@ -26,18 +26,18 @@
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
 import org.neo4j.graphdb.Label;
+import org.neo4j.graphdb.RelationshipType;
 
 class CypherValuesCreator extends FeatureResultsBaseListener
 {
     private Stack<Object> workload;
     private Stack<Integer> listCounters;
     private Stack<Integer> mapCounters;
-    private List<Label> labels;
+    private Stack<String> names;
 
     private static final String INFINITY = "Inf";
 
@@ -46,7 +46,7 @@ class CypherValuesCreator extends FeatureResultsBaseListener
         this.workload = new Stack<>();
         this.listCounters = new Stack<>();
         this.mapCounters = new Stack<>();
-        this.labels = new ArrayList<>();
+        this.names = new Stack<>();
     }
 
     Object parsed()
@@ -155,23 +155,18 @@ public void enterPropertyKey( FeatureResultsParser.PropertyKeyContext ctx )
     @Override
     public void enterLabelName( FeatureResultsParser.LabelNameContext ctx )
     {
-        labels.add( Label.label( ctx.getText() ) );
+        names.push( ctx.getText() );
     }
 
     @Override
     public void exitNode( FeatureResultsParser.NodeContext ctx )
     {
-        final Map<String,Object> properties;
-        if ( workload.empty() )
-        {
-            properties = new HashMap<>();
-        }
-        else
+        final Map<String,Object> properties = getMapOrEmpty();
+        final ArrayList<Label> nodeLabels = new ArrayList<>();
+        while ( !names.empty() )
         {
-            properties = (Map<String,Object>) workload.pop();
+            nodeLabels.add( Label.label( names.pop() ) );
         }
-        final ArrayList<Label> nodeLabels = new ArrayList<>( labels );
-        labels.clear();
         workload.push( new ParsedNode()
         {
             @Override
@@ -187,4 +182,43 @@ public Iterable<Label> getLabels()
             }
         } );
     }
+
+    private Map<String,Object> getMapOrEmpty()
+    {
+        if ( workload.empty() )
+        {
+            return new HashMap<>();
+        }
+        else
+        {
+            return (Map<String,Object>) workload.pop();
+        }
+    }
+
+    @Override
+    public void enterRelationshipTypeName( FeatureResultsParser.RelationshipTypeNameContext ctx )
+    {
+        names.push( ctx.getText() );
+    }
+
+    @Override
+    public void exitRelationship( FeatureResultsParser.RelationshipContext ctx )
+    {
+        final Map<String,Object> properties = getMapOrEmpty();
+        final RelationshipType type = RelationshipType.withName( names.pop() );
+        workload.push( new ParsedRelationship()
+        {
+            @Override
+            public RelationshipType getType()
+            {
+                return type;
+            }
+
+            @Override
+            public Map<String,Object> getAllProperties()
+            {
+                return properties;
+            }
+        } );
+    }
 }
diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedNode.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedNode.java
index 20f2adc8a1f2..7461be14893f 100644
--- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedNode.java
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedNode.java
@@ -245,4 +245,20 @@ else if ( obj instanceof ParsedNode )
         }
         return false;
     }
+
+    public static Node parsedNode(final Iterable<Label> labelNames, final Map<String, Object> properties) {
+        return new ParsedNode() {
+            @Override
+            public Map<String,Object> getAllProperties()
+            {
+                return properties;
+            }
+
+            @Override
+            public Iterable<Label> getLabels()
+            {
+                return labelNames;
+            }
+        };
+    }
 }
diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedRelationship.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedRelationship.java
new file mode 100644
index 000000000000..bcb340edc5c8
--- /dev/null
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/ParsedRelationship.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package cypher.feature.parser;
+
+import java.util.Map;
+
+import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Relationship;
+import org.neo4j.graphdb.RelationshipType;
+
+public class ParsedRelationship implements Relationship
+{
+    @Override
+    public long getId()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void delete()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Node getStartNode()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Node getEndNode()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Node getOtherNode( Node node )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Node[] getNodes()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public RelationshipType getType()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isType( RelationshipType type )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public GraphDatabaseService getGraphDatabase()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasProperty( String key )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object getProperty( String key )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object getProperty( String key, Object defaultValue )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setProperty( String key, Object value )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object removeProperty( String key )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Iterable<String> getPropertyKeys()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<String,Object> getProperties( String... keys )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<String,Object> getAllProperties()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( obj == null )
+        {
+            return false;
+        }
+        else if ( obj instanceof ParsedRelationship )
+        {
+            ParsedRelationship other = (ParsedRelationship) obj;
+
+            boolean typeEquality = this.getType().equals( other.getType() );
+            boolean propEquality = getAllProperties().equals( other.getAllProperties() );
+            return typeEquality && propEquality;
+        }
+        return false;
+    }
+
+    public static Relationship parsedRelationship( final RelationshipType type, final Map<String,Object> properties )
+    {
+        return new ParsedRelationship()
+        {
+            @Override
+            public Map<String,Object> getAllProperties()
+            {
+                return properties;
+            }
+
+            @Override
+            public RelationshipType getType()
+            {
+                return type;
+            }
+        };
+    }
+
+}
diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsBaseListener.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsBaseListener.java
index c70b7ba7e744..8a1aa7c07a88 100644
--- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsBaseListener.java
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsBaseListener.java
@@ -258,6 +258,18 @@ public class FeatureResultsBaseListener implements FeatureResultsListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitRelationshipType(FeatureResultsParser.RelationshipTypeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterRelationshipTypeName(FeatureResultsParser.RelationshipTypeNameContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitRelationshipTypeName(FeatureResultsParser.RelationshipTypeNameContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsListener.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsListener.java
index 2d6d481a1222..7dfcede720f8 100644
--- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsListener.java
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsListener.java
@@ -216,6 +216,16 @@ public interface FeatureResultsListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitRelationshipType(FeatureResultsParser.RelationshipTypeContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link FeatureResultsParser#relationshipTypeName}.
+	 * @param ctx the parse tree
+	 */
+	void enterRelationshipTypeName(FeatureResultsParser.RelationshipTypeNameContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link FeatureResultsParser#relationshipTypeName}.
+	 * @param ctx the parse tree
+	 */
+	void exitRelationshipTypeName(FeatureResultsParser.RelationshipTypeNameContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link FeatureResultsParser#label}.
 	 * @param ctx the parse tree
diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsParser.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsParser.java
index 4a732256c737..bd2492a33089 100644
--- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsParser.java
+++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/generated/FeatureResultsParser.java
@@ -46,12 +46,13 @@ public class FeatureResultsParser extends Parser {
 		RULE_list = 9, RULE_listContents = 10, RULE_listElement = 11, RULE_map = 12, 
 		RULE_propertyMap = 13, RULE_mapContents = 14, RULE_keyValuePair = 15, 
 		RULE_propertyKey = 16, RULE_propertyValue = 17, RULE_relationshipType = 18, 
-		RULE_label = 19, RULE_labelName = 20, RULE_string = 21;
+		RULE_relationshipTypeName = 19, RULE_label = 20, RULE_labelName = 21, 
+		RULE_string = 22;
 	public static final String[] ruleNames = {
 		"value", "node", "relationship", "path", "pathElement", "integer", "floatingPoint", 
 		"bool", "nullValue", "list", "listContents", "listElement", "map", "propertyMap", 
 		"mapContents", "keyValuePair", "propertyKey", "propertyValue", "relationshipType", 
-		"label", "labelName", "string"
+		"relationshipTypeName", "label", "labelName", "string"
 	};
 
 	private static final String[] _LITERAL_NAMES = {
@@ -163,75 +164,75 @@ public final ValueContext value() throws RecognitionException {
 		ValueContext _localctx = new ValueContext(_ctx, getState());
 		enterRule(_localctx, 0, RULE_value);
 		try {
-			setState(54);
+			setState(56);
 			switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(44);
+				setState(46);
 				node();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(45);
+				setState(47);
 				relationship();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(46);
+				setState(48);
 				path();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(47);
+				setState(49);
 				integer();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(48);
+				setState(50);
 				floatingPoint();
 				}
 				break;
 			case 6:
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(49);
+				setState(51);
 				string();
 				}
 				break;
 			case 7:
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(50);
+				setState(52);
 				bool();
 				}
 				break;
 			case 8:
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(51);
+				setState(53);
 				nullValue();
 				}
 				break;
 			case 9:
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(52);
+				setState(54);
 				list();
 				}
 				break;
 			case 10:
 				enterOuterAlt(_localctx, 10);
 				{
-				setState(53);
+				setState(55);
 				map();
 				}
 				break;
@@ -280,41 +281,41 @@ public final NodeContext node() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(56);
+			setState(58);
 			match(T__0);
-			setState(60);
+			setState(62);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__12) {
 				{
 				{
-				setState(57);
+				setState(59);
 				label();
 				}
 				}
-				setState(62);
+				setState(64);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(64);
+			setState(66);
 			_la = _input.LA(1);
 			if (_la==WS) {
 				{
-				setState(63);
+				setState(65);
 				match(WS);
 				}
 			}
 
-			setState(67);
+			setState(69);
 			_la = _input.LA(1);
 			if (_la==T__10) {
 				{
-				setState(66);
+				setState(68);
 				propertyMap();
 				}
 			}
 
-			setState(69);
+			setState(71);
 			match(T__1);
 			}
 		}
@@ -364,27 +365,27 @@ public final RelationshipContext relationship() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(71);
+			setState(73);
 			match(T__2);
-			setState(72);
+			setState(74);
 			relationshipType();
-			setState(77);
+			setState(79);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==WS) {
 				{
 				{
-				setState(73);
+				setState(75);
 				match(WS);
-				setState(74);
+				setState(76);
 				propertyMap();
 				}
 				}
-				setState(79);
+				setState(81);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(80);
+			setState(82);
 			match(T__3);
 			}
 		}
@@ -424,18 +425,18 @@ public final PathContext path() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(82);
-			match(T__4);
 			setState(84);
+			match(T__4);
+			setState(86);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(83);
+				setState(85);
 				pathElement();
 				}
 			}
 
-			setState(86);
+			setState(88);
 			match(T__5);
 			}
 		}
@@ -484,25 +485,25 @@ public final PathElementContext pathElement() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(88);
+			setState(90);
 			node();
-			setState(96);
+			setState(98);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__6) {
 				{
 				{
-				setState(89);
-				match(T__6);
-				setState(90);
-				relationship();
 				setState(91);
 				match(T__6);
 				setState(92);
+				relationship();
+				setState(93);
+				match(T__6);
+				setState(94);
 				node();
 				}
 				}
-				setState(98);
+				setState(100);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -541,7 +542,7 @@ public final IntegerContext integer() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(99);
+			setState(101);
 			match(IntegerLiteral);
 			}
 		}
@@ -580,7 +581,7 @@ public final FloatingPointContext floatingPoint() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(101);
+			setState(103);
 			_la = _input.LA(1);
 			if ( !(_la==INFINITY || _la==FloatingPointLiteral) ) {
 			_errHandler.recoverInline(this);
@@ -622,7 +623,7 @@ public final BoolContext bool() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(103);
+			setState(105);
 			_la = _input.LA(1);
 			if ( !(_la==T__7 || _la==T__8) ) {
 			_errHandler.recoverInline(this);
@@ -663,7 +664,7 @@ public final NullValueContext nullValue() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(105);
+			setState(107);
 			match(T__9);
 			}
 		}
@@ -703,18 +704,18 @@ public final ListContext list() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(107);
-			match(T__2);
 			setState(109);
+			match(T__2);
+			setState(111);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__2) | (1L << T__4) | (1L << T__7) | (1L << T__8) | (1L << T__9) | (1L << T__10) | (1L << IntegerLiteral) | (1L << INFINITY) | (1L << FloatingPointLiteral) | (1L << StringLiteral))) != 0)) {
 				{
-				setState(108);
+				setState(110);
 				listContents();
 				}
 			}
 
-			setState(111);
+			setState(113);
 			match(T__3);
 			}
 		}
@@ -757,21 +758,21 @@ public final ListContentsContext listContents() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(113);
+			setState(115);
 			listElement();
-			setState(118);
+			setState(120);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__6) {
 				{
 				{
-				setState(114);
+				setState(116);
 				match(T__6);
-				setState(115);
+				setState(117);
 				listElement();
 				}
 				}
-				setState(120);
+				setState(122);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -812,7 +813,7 @@ public final ListElementContext listElement() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(121);
+			setState(123);
 			value();
 			}
 		}
@@ -851,7 +852,7 @@ public final MapContext map() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(123);
+			setState(125);
 			propertyMap();
 			}
 		}
@@ -891,18 +892,18 @@ public final PropertyMapContext propertyMap() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(125);
-			match(T__10);
 			setState(127);
+			match(T__10);
+			setState(129);
 			_la = _input.LA(1);
 			if (_la==SymbolicNameString) {
 				{
-				setState(126);
+				setState(128);
 				mapContents();
 				}
 			}
 
-			setState(129);
+			setState(131);
 			match(T__11);
 			}
 		}
@@ -945,21 +946,21 @@ public final MapContentsContext mapContents() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(131);
+			setState(133);
 			keyValuePair();
-			setState(136);
+			setState(138);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__6) {
 				{
 				{
-				setState(132);
+				setState(134);
 				match(T__6);
-				setState(133);
+				setState(135);
 				keyValuePair();
 				}
 				}
-				setState(138);
+				setState(140);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1003,11 +1004,11 @@ public final KeyValuePairContext keyValuePair() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(139);
+			setState(141);
 			propertyKey();
-			setState(140);
+			setState(142);
 			match(T__12);
-			setState(141);
+			setState(143);
 			propertyValue();
 			}
 		}
@@ -1044,7 +1045,7 @@ public final PropertyKeyContext propertyKey() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(143);
+			setState(145);
 			match(SymbolicNameString);
 			}
 		}
@@ -1083,7 +1084,7 @@ public final PropertyValueContext propertyValue() throws RecognitionException {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(145);
+			setState(147);
 			value();
 			}
 		}
@@ -1099,7 +1100,9 @@ public final PropertyValueContext propertyValue() throws RecognitionException {
 	}
 
 	public static class RelationshipTypeContext extends ParserRuleContext {
-		public TerminalNode SymbolicNameString() { return getToken(FeatureResultsParser.SymbolicNameString, 0); }
+		public RelationshipTypeNameContext relationshipTypeName() {
+			return getRuleContext(RelationshipTypeNameContext.class,0);
+		}
 		public RelationshipTypeContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1120,9 +1123,46 @@ public final RelationshipTypeContext relationshipType() throws RecognitionExcept
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(147);
+			setState(149);
 			match(T__12);
-			setState(148);
+			setState(150);
+			relationshipTypeName();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class RelationshipTypeNameContext extends ParserRuleContext {
+		public TerminalNode SymbolicNameString() { return getToken(FeatureResultsParser.SymbolicNameString, 0); }
+		public RelationshipTypeNameContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_relationshipTypeName; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof FeatureResultsListener ) ((FeatureResultsListener)listener).enterRelationshipTypeName(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof FeatureResultsListener ) ((FeatureResultsListener)listener).exitRelationshipTypeName(this);
+		}
+	}
+
+	public final RelationshipTypeNameContext relationshipTypeName() throws RecognitionException {
+		RelationshipTypeNameContext _localctx = new RelationshipTypeNameContext(_ctx, getState());
+		enterRule(_localctx, 38, RULE_relationshipTypeName);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(152);
 			match(SymbolicNameString);
 			}
 		}
@@ -1157,13 +1197,13 @@ public void exitRule(ParseTreeListener listener) {
 
 	public final LabelContext label() throws RecognitionException {
 		LabelContext _localctx = new LabelContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_label);
+		enterRule(_localctx, 40, RULE_label);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(150);
+			setState(154);
 			match(T__12);
-			setState(151);
+			setState(155);
 			labelName();
 			}
 		}
@@ -1196,11 +1236,11 @@ public void exitRule(ParseTreeListener listener) {
 
 	public final LabelNameContext labelName() throws RecognitionException {
 		LabelNameContext _localctx = new LabelNameContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_labelName);
+		enterRule(_localctx, 42, RULE_labelName);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(153);
+			setState(157);
 			match(SymbolicNameString);
 			}
 		}
@@ -1233,11 +1273,11 @@ public void exitRule(ParseTreeListener listener) {
 
 	public final StringContext string() throws RecognitionException {
 		StringContext _localctx = new StringContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_string);
+		enterRule(_localctx, 44, RULE_string);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(155);
+			setState(159);
 			match(StringLiteral);
 			}
 		}
@@ -1253,48 +1293,49 @@ public final StringContext string() throws RecognitionException {
 	}
 
 	public static final String _serializedATN =
-		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\33\u00a0\4\2\t\2"+
+		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\33\u00a4\4\2\t\2"+
 		"\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
-		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\3\2\3\2\3\2\3\2\3\2"+
-		"\3\2\3\2\3\2\3\2\3\2\5\29\n\2\3\3\3\3\7\3=\n\3\f\3\16\3@\13\3\3\3\5\3"+
-		"C\n\3\3\3\5\3F\n\3\3\3\3\3\3\4\3\4\3\4\3\4\7\4N\n\4\f\4\16\4Q\13\4\3\4"+
-		"\3\4\3\5\3\5\5\5W\n\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\7\6a\n\6\f\6\16"+
-		"\6d\13\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\13\3\13\5\13p\n\13\3\13\3\13"+
-		"\3\f\3\f\3\f\7\fw\n\f\f\f\16\fz\13\f\3\r\3\r\3\16\3\16\3\17\3\17\5\17"+
-		"\u0082\n\17\3\17\3\17\3\20\3\20\3\20\7\20\u0089\n\20\f\20\16\20\u008c"+
-		"\13\20\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\24\3\25\3\25"+
-		"\3\25\3\26\3\26\3\27\3\27\3\27\2\2\30\2\4\6\b\n\f\16\20\22\24\26\30\32"+
-		"\34\36 \"$&(*,\2\4\3\2\24\25\3\2\n\13\u009c\28\3\2\2\2\4:\3\2\2\2\6I\3"+
-		"\2\2\2\bT\3\2\2\2\nZ\3\2\2\2\fe\3\2\2\2\16g\3\2\2\2\20i\3\2\2\2\22k\3"+
-		"\2\2\2\24m\3\2\2\2\26s\3\2\2\2\30{\3\2\2\2\32}\3\2\2\2\34\177\3\2\2\2"+
-		"\36\u0085\3\2\2\2 \u008d\3\2\2\2\"\u0091\3\2\2\2$\u0093\3\2\2\2&\u0095"+
-		"\3\2\2\2(\u0098\3\2\2\2*\u009b\3\2\2\2,\u009d\3\2\2\2.9\5\4\3\2/9\5\6"+
-		"\4\2\609\5\b\5\2\619\5\f\7\2\629\5\16\b\2\639\5,\27\2\649\5\20\t\2\65"+
-		"9\5\22\n\2\669\5\24\13\2\679\5\32\16\28.\3\2\2\28/\3\2\2\28\60\3\2\2\2"+
-		"8\61\3\2\2\28\62\3\2\2\28\63\3\2\2\28\64\3\2\2\28\65\3\2\2\28\66\3\2\2"+
-		"\28\67\3\2\2\29\3\3\2\2\2:>\7\3\2\2;=\5(\25\2<;\3\2\2\2=@\3\2\2\2><\3"+
-		"\2\2\2>?\3\2\2\2?B\3\2\2\2@>\3\2\2\2AC\7\31\2\2BA\3\2\2\2BC\3\2\2\2CE"+
-		"\3\2\2\2DF\5\34\17\2ED\3\2\2\2EF\3\2\2\2FG\3\2\2\2GH\7\4\2\2H\5\3\2\2"+
-		"\2IJ\7\5\2\2JO\5&\24\2KL\7\31\2\2LN\5\34\17\2MK\3\2\2\2NQ\3\2\2\2OM\3"+
-		"\2\2\2OP\3\2\2\2PR\3\2\2\2QO\3\2\2\2RS\7\6\2\2S\7\3\2\2\2TV\7\7\2\2UW"+
-		"\5\n\6\2VU\3\2\2\2VW\3\2\2\2WX\3\2\2\2XY\7\b\2\2Y\t\3\2\2\2Zb\5\4\3\2"+
-		"[\\\7\t\2\2\\]\5\6\4\2]^\7\t\2\2^_\5\4\3\2_a\3\2\2\2`[\3\2\2\2ad\3\2\2"+
-		"\2b`\3\2\2\2bc\3\2\2\2c\13\3\2\2\2db\3\2\2\2ef\7\20\2\2f\r\3\2\2\2gh\t"+
-		"\2\2\2h\17\3\2\2\2ij\t\3\2\2j\21\3\2\2\2kl\7\f\2\2l\23\3\2\2\2mo\7\5\2"+
-		"\2np\5\26\f\2on\3\2\2\2op\3\2\2\2pq\3\2\2\2qr\7\6\2\2r\25\3\2\2\2sx\5"+
-		"\30\r\2tu\7\t\2\2uw\5\30\r\2vt\3\2\2\2wz\3\2\2\2xv\3\2\2\2xy\3\2\2\2y"+
-		"\27\3\2\2\2zx\3\2\2\2{|\5\2\2\2|\31\3\2\2\2}~\5\34\17\2~\33\3\2\2\2\177"+
-		"\u0081\7\r\2\2\u0080\u0082\5\36\20\2\u0081\u0080\3\2\2\2\u0081\u0082\3"+
-		"\2\2\2\u0082\u0083\3\2\2\2\u0083\u0084\7\16\2\2\u0084\35\3\2\2\2\u0085"+
-		"\u008a\5 \21\2\u0086\u0087\7\t\2\2\u0087\u0089\5 \21\2\u0088\u0086\3\2"+
-		"\2\2\u0089\u008c\3\2\2\2\u008a\u0088\3\2\2\2\u008a\u008b\3\2\2\2\u008b"+
-		"\37\3\2\2\2\u008c\u008a\3\2\2\2\u008d\u008e\5\"\22\2\u008e\u008f\7\17"+
-		"\2\2\u008f\u0090\5$\23\2\u0090!\3\2\2\2\u0091\u0092\7\30\2\2\u0092#\3"+
-		"\2\2\2\u0093\u0094\5\2\2\2\u0094%\3\2\2\2\u0095\u0096\7\17\2\2\u0096\u0097"+
-		"\7\30\2\2\u0097\'\3\2\2\2\u0098\u0099\7\17\2\2\u0099\u009a\5*\26\2\u009a"+
-		")\3\2\2\2\u009b\u009c\7\30\2\2\u009c+\3\2\2\2\u009d\u009e\7\33\2\2\u009e"+
-		"-\3\2\2\2\r8>BEOVbox\u0081\u008a";
+		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\3\2\3\2\3"+
+		"\2\3\2\3\2\3\2\3\2\3\2\3\2\3\2\5\2;\n\2\3\3\3\3\7\3?\n\3\f\3\16\3B\13"+
+		"\3\3\3\5\3E\n\3\3\3\5\3H\n\3\3\3\3\3\3\4\3\4\3\4\3\4\7\4P\n\4\f\4\16\4"+
+		"S\13\4\3\4\3\4\3\5\3\5\5\5Y\n\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\7\6c\n"+
+		"\6\f\6\16\6f\13\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\13\3\13\5\13r\n\13"+
+		"\3\13\3\13\3\f\3\f\3\f\7\fy\n\f\f\f\16\f|\13\f\3\r\3\r\3\16\3\16\3\17"+
+		"\3\17\5\17\u0084\n\17\3\17\3\17\3\20\3\20\3\20\7\20\u008b\n\20\f\20\16"+
+		"\20\u008e\13\20\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\24"+
+		"\3\25\3\25\3\26\3\26\3\26\3\27\3\27\3\30\3\30\3\30\2\2\31\2\4\6\b\n\f"+
+		"\16\20\22\24\26\30\32\34\36 \"$&(*,.\2\4\3\2\24\25\3\2\n\13\u009f\2:\3"+
+		"\2\2\2\4<\3\2\2\2\6K\3\2\2\2\bV\3\2\2\2\n\\\3\2\2\2\fg\3\2\2\2\16i\3\2"+
+		"\2\2\20k\3\2\2\2\22m\3\2\2\2\24o\3\2\2\2\26u\3\2\2\2\30}\3\2\2\2\32\177"+
+		"\3\2\2\2\34\u0081\3\2\2\2\36\u0087\3\2\2\2 \u008f\3\2\2\2\"\u0093\3\2"+
+		"\2\2$\u0095\3\2\2\2&\u0097\3\2\2\2(\u009a\3\2\2\2*\u009c\3\2\2\2,\u009f"+
+		"\3\2\2\2.\u00a1\3\2\2\2\60;\5\4\3\2\61;\5\6\4\2\62;\5\b\5\2\63;\5\f\7"+
+		"\2\64;\5\16\b\2\65;\5.\30\2\66;\5\20\t\2\67;\5\22\n\28;\5\24\13\29;\5"+
+		"\32\16\2:\60\3\2\2\2:\61\3\2\2\2:\62\3\2\2\2:\63\3\2\2\2:\64\3\2\2\2:"+
+		"\65\3\2\2\2:\66\3\2\2\2:\67\3\2\2\2:8\3\2\2\2:9\3\2\2\2;\3\3\2\2\2<@\7"+
+		"\3\2\2=?\5*\26\2>=\3\2\2\2?B\3\2\2\2@>\3\2\2\2@A\3\2\2\2AD\3\2\2\2B@\3"+
+		"\2\2\2CE\7\31\2\2DC\3\2\2\2DE\3\2\2\2EG\3\2\2\2FH\5\34\17\2GF\3\2\2\2"+
+		"GH\3\2\2\2HI\3\2\2\2IJ\7\4\2\2J\5\3\2\2\2KL\7\5\2\2LQ\5&\24\2MN\7\31\2"+
+		"\2NP\5\34\17\2OM\3\2\2\2PS\3\2\2\2QO\3\2\2\2QR\3\2\2\2RT\3\2\2\2SQ\3\2"+
+		"\2\2TU\7\6\2\2U\7\3\2\2\2VX\7\7\2\2WY\5\n\6\2XW\3\2\2\2XY\3\2\2\2YZ\3"+
+		"\2\2\2Z[\7\b\2\2[\t\3\2\2\2\\d\5\4\3\2]^\7\t\2\2^_\5\6\4\2_`\7\t\2\2`"+
+		"a\5\4\3\2ac\3\2\2\2b]\3\2\2\2cf\3\2\2\2db\3\2\2\2de\3\2\2\2e\13\3\2\2"+
+		"\2fd\3\2\2\2gh\7\20\2\2h\r\3\2\2\2ij\t\2\2\2j\17\3\2\2\2kl\t\3\2\2l\21"+
+		"\3\2\2\2mn\7\f\2\2n\23\3\2\2\2oq\7\5\2\2pr\5\26\f\2qp\3\2\2\2qr\3\2\2"+
+		"\2rs\3\2\2\2st\7\6\2\2t\25\3\2\2\2uz\5\30\r\2vw\7\t\2\2wy\5\30\r\2xv\3"+
+		"\2\2\2y|\3\2\2\2zx\3\2\2\2z{\3\2\2\2{\27\3\2\2\2|z\3\2\2\2}~\5\2\2\2~"+
+		"\31\3\2\2\2\177\u0080\5\34\17\2\u0080\33\3\2\2\2\u0081\u0083\7\r\2\2\u0082"+
+		"\u0084\5\36\20\2\u0083\u0082\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0085\3"+
+		"\2\2\2\u0085\u0086\7\16\2\2\u0086\35\3\2\2\2\u0087\u008c\5 \21\2\u0088"+
+		"\u0089\7\t\2\2\u0089\u008b\5 \21\2\u008a\u0088\3\2\2\2\u008b\u008e\3\2"+
+		"\2\2\u008c\u008a\3\2\2\2\u008c\u008d\3\2\2\2\u008d\37\3\2\2\2\u008e\u008c"+
+		"\3\2\2\2\u008f\u0090\5\"\22\2\u0090\u0091\7\17\2\2\u0091\u0092\5$\23\2"+
+		"\u0092!\3\2\2\2\u0093\u0094\7\30\2\2\u0094#\3\2\2\2\u0095\u0096\5\2\2"+
+		"\2\u0096%\3\2\2\2\u0097\u0098\7\17\2\2\u0098\u0099\5(\25\2\u0099\'\3\2"+
+		"\2\2\u009a\u009b\7\30\2\2\u009b)\3\2\2\2\u009c\u009d\7\17\2\2\u009d\u009e"+
+		"\5,\27\2\u009e+\3\2\2\2\u009f\u00a0\7\30\2\2\u00a0-\3\2\2\2\u00a1\u00a2"+
+		"\7\33\2\2\u00a2/\3\2\2\2\r:@DGQXdqz\u0083\u008c";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/community/cypher/compatibility-suite/src/main/resources/FeatureResults.g4 b/community/cypher/compatibility-suite/src/main/resources/FeatureResults.g4
index 64ee2616fa20..a5a26e4aa25a 100644
--- a/community/cypher/compatibility-suite/src/main/resources/FeatureResults.g4
+++ b/community/cypher/compatibility-suite/src/main/resources/FeatureResults.g4
@@ -47,7 +47,9 @@ propertyKey : SymbolicNameString ;
 
 propertyValue : value ;
 
-relationshipType : ':' SymbolicNameString ;
+relationshipType : ':' relationshipTypeName ;
+
+relationshipTypeName : SymbolicNameString ;
 
 label : ':' labelName ;
 
diff --git a/community/cypher/compatibility-suite/src/main/scala/cypher/feature/parser/ParsedEntities.scala b/community/cypher/compatibility-suite/src/main/scala/cypher/feature/parser/ParsedEntities.scala
deleted file mode 100644
index 785d75434bd1..000000000000
--- a/community/cypher/compatibility-suite/src/main/scala/cypher/feature/parser/ParsedEntities.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package cypher.feature.parser
-
-import java.lang.Iterable
-import java.util
-import java.util.Collections.emptyList
-import java.util.function.Consumer
-
-import org.neo4j.graphdb._
-
-trait ParsedEntities {
-
-  def parsedNode(labelNames: Iterable[String] = emptyList(), properties: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef]()): Node = {
-    new ParsedNode() {
-      override def getLabels: Iterable[Label] = {
-        val list = new util.ArrayList[Label]()
-        labelNames.forEach(new Consumer[String] {
-          override def accept(t: String): Unit = list.add(Label.label(t))
-        })
-        list
-      }
-
-      override def getAllProperties: util.Map[String, AnyRef] = properties
-    }
-  }
-
-}
diff --git a/community/cypher/compatibility-suite/src/test/scala/cypher/feature/parser/expectedResultsParserTest.scala b/community/cypher/compatibility-suite/src/test/scala/cypher/feature/parser/expectedResultsParserTest.scala
index 33270689b2c3..96fc84525c04 100644
--- a/community/cypher/compatibility-suite/src/test/scala/cypher/feature/parser/expectedResultsParserTest.scala
+++ b/community/cypher/compatibility-suite/src/test/scala/cypher/feature/parser/expectedResultsParserTest.scala
@@ -24,9 +24,11 @@ import java.lang.Long
 import java.util.Arrays.asList
 import java.util.Collections.{emptyList, emptyMap}
 import java.{lang, util}
+
+import org.neo4j.graphdb.{RelationshipType, Relationship, Label, Node}
 import org.scalatest.{FunSuite, Matchers}
 
-class expectedResultsParserTest extends FunSuite with Matchers with ParsedEntities {
+class expectedResultsParserTest extends FunSuite with Matchers {
 
   test("should parse null") {
     parse("null") should equal(null)
@@ -92,33 +94,56 @@ class expectedResultsParserTest extends FunSuite with Matchers with ParsedEntiti
 
   test("should parse maps") {
     parse("{}") should equal(emptyMap())
-    parse("{k0:'\n\r\f\t'}") should equal(asMap("k0" -> "\n\r\f\t"))
+    parse("{k0:'\n\r\f\t'}") should equal(asMap(Map("k0" -> "\n\r\f\t")))
     parse("{k0:0, k1:1.0e-10, k2:null, k3:true}") should equal(
-      asMap("k0" -> Long.valueOf(0), "k1" -> lang.Double.valueOf(1e-10), "k2" -> null, "k3" -> TRUE))
+      asMap(Map("k0" -> Long.valueOf(0), "k1" -> lang.Double.valueOf(1e-10), "k2" -> null, "k3" -> TRUE)))
   }
 
-  test("should parse nodes") {
+  test("should parse nodes with labels") {
     parse("()") should equal(parsedNode())
-    parse("(:T)") should equal(parsedNode(asList("T")))
-    parse("(:T:T2:longlabel)") should equal(parsedNode(asList("T", "T2", "longlabel")))
+    parse("(:T)") should equal(parsedNode(Seq("T")))
+    parse("(:T:T2:longlabel)") should equal(parsedNode(Seq("T", "T2", "longlabel")))
   }
 
   test("should parse nodes with properties") {
-    parse("({key:'value'})") should equal(parsedNode(properties = asMap("key" -> "value")))
-    parse("({key:0})") should equal(parsedNode(properties = asMap("key" -> Long.valueOf(0L))))
-    parse("({key:null, key2:[]})") should equal(parsedNode(properties = asMap("key" -> null, "key2" -> emptyList())))
+    parse("({key:'value'})") should equal(parsedNode(properties = Map("key" -> "value")))
+    parse("({key:0})") should equal(parsedNode(properties = Map("key" -> Long.valueOf(0L))))
+    parse("({key:null, key2:[]})") should equal(parsedNode(properties = Map("key" -> null, "key2" -> emptyList())))
   }
 
-  def asMap(tuples: (String, AnyRef)*): util.Map[String, AnyRef] = {
-    val map = new util.HashMap[String, AnyRef]()
-    tuples.foreach {
-      case (k, v) => map.put(k, v)
-    }
-    map
+  test("should parse nodes with labels and properties") {
+    parse("(:T {k:[]})") should equal(parsedNode(Seq("T"), Map("k" -> emptyList())))
+    val expected = parsedNode(Seq("T", "longlabel"),
+                              Map("k" -> emptyList(), "verylongkeywithonlyletters" -> lang.Double.valueOf("Infinity")))
+    parse("(:T:longlabel {k:[], verylongkeywithonlyletters:Inf})") should equal(expected)
+  }
+
+  test("should parse relationships") {
+    parse("[:T]") should equal(parsedRelationship("T"))
+    parse("[:T {k:0}]") should equal(parsedRelationship("T", Map("k" -> Long.valueOf(0L))))
   }
 
   private def parse(value: String) = {
     scalaResultsParser(value)
   }
 
+  private def parsedRelationship(typ: String, properties: Map[String, AnyRef] = Map.empty): Relationship = {
+    ParsedRelationship.parsedRelationship(RelationshipType.withName(typ), asMap(properties))
+  }
+
+  private def parsedNode(labels: Seq[String] = Seq.empty, properties: Map[String, AnyRef] = Map.empty): Node = {
+    val list = new util.ArrayList[Label]()
+    labels.foreach(name => list.add(Label.label(name)))
+
+    ParsedNode.parsedNode(list, asMap(properties))
+  }
+
+  private def asMap(scalaMap: Map[String, AnyRef]): util.Map[String, AnyRef] = {
+    val map = new util.HashMap[String, AnyRef]()
+    scalaMap.foreach {
+      case (k, v) => map.put(k, v)
+    }
+    map
+  }
+
 }