Use relationship alias for this in directive on rich relationship

core/src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt

@@ -261,7 +261,7 @@ open class ProjectionBase(
         val cypherDirective = fieldDefinition.cypherDirective()
         val isObjectField = fieldDefinition.type.inner() is GraphQLFieldsContainer
         if (cypherDirective != null) {
-            val query = cypherDirective(field.contextualize(variable), fieldDefinition, field, cypherDirective, propertyContainer.requiredSymbolicName)
+            val query = cypherDirective(field.contextualize(variable), fieldDefinition, field, cypherDirective, variable.concat(""))
             projections += if (isObjectField && !cypherDirective.passThrough) {
                 projectListComprehension(variable, field, fieldDefinition, env, query, variableSuffix)
             } else {

core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt

@@ -71,6 +71,9 @@ class CypherTests {
     @TestFactory
     fun `custom-fields`() = CypherTestSuite("custom-fields.adoc", neo4j).generateTests()
 
+    @TestFactory
+    fun `relationship-directive`() = CypherTestSuite("relationship-directive.adoc", neo4j).generateTests()
+
     @TestFactory
     fun `test issues`() =  createTestsInPath("issues", { CypherTestSuite(it, neo4j).generateTests() })
 

core/src/test/resources/relationship-directive.adoc

@@ -0,0 +1,72 @@
+:toc:
+
+= Cypher Directive Test
+
+== Schema
+
+[source,graphql,schema=true]
+----
+type Role @relation(name:"ACTED_IN", from:"actor", to:"movie") {
+   actor: Person
+   movie: Movie
+   roles: [String]
+   type: String @cypher(statement:"""
+     RETURN type(this)
+     """)
+}
+
+type Person {
+  name: String
+  born: Int
+  roles: [Role]
+  _all: String
+  _id: ID!
+}
+
+type Movie {
+  title: String
+  released: Int
+  characters: [Role]
+  _all: String
+  _id: ID!
+  _labels: [String] @cypher(statement:"""
+  RETURN labels(this)
+  """)
+}
+
+----
+
+== Queries
+
+=== Simple Cypher Directive on Field
+
+.GraphQL-Query
+[source,graphql]
+----
+query {
+  person {
+    roles {
+      type
+    }
+  }
+}
+----
+
+.Cypher Params
+[source,json]
+----
+{}
+----
+
+.Cypher
+[source,cypher]
+----
+MATCH (person:Person)
+RETURN person {
+	roles: [(person)-[personRoles:ACTED_IN]->(personRolesMovie:Movie) | personRoles {
+		type: apoc.cypher.runFirstColumnSingle('WITH $this AS this RETURN type(this)',  {
+			this: personRoles
+		})
+	}]
+} AS person
+----