Skip to content

This bugfix solves a problem where inverse relationships were incorrectly mapped #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2020
Merged

This bugfix solves a problem where inverse relationships were incorrectly mapped #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open class ProjectionBase {
if (values.isEmpty()) {
return ""
}
return " ORDER BY " + values.joinToString(", ", transform = { (property, direction) -> "$variable.$property $direction" })
return " ORDER BY " + values.joinToString(", ", transform = { (property, direction) -> "$variable.${property.quote()} $direction" })
}

private fun getOrderByArgs(args: MutableList<Argument>): List<Pair<String, Sort>> {
Expand Down Expand Up @@ -310,8 +310,10 @@ open class ProjectionBase {
private fun relationshipInfoInCorrectDirection(fieldObjectType: GraphQLFieldsContainer, relInfo0: RelationshipInfo, parent: GraphQLFieldsContainer, relDirectiveField: RelationshipInfo?): RelationshipInfo {
val startField = fieldObjectType.getFieldDefinition(relInfo0.startField)!!
val endField = fieldObjectType.getFieldDefinition(relInfo0.endField)!!
val startFieldTypeName = startField.type.inner().name
val inverse = startFieldTypeName != parent.name || startField.type.name == endField.type.name && relDirectiveField?.out != relInfo0.out
val startFieldTypeName = startField.type.innerName()
val inverse = startFieldTypeName != parent.name
|| startFieldTypeName == endField.type.innerName()
&& relDirectiveField?.out != relInfo0.out
return if (inverse) relInfo0.copy(out = relInfo0.out?.not(), startField = relInfo0.endField, endField = relInfo0.startField) else relInfo0
}

Expand Down Expand Up @@ -342,7 +344,7 @@ open class ProjectionBase {

val (endNodePattern, variableSuffix) = when {
isRelFromType -> {
val label = nodeType.getFieldDefinition(relInfo.endField!!)!!.type.inner().name
val label = nodeType.getFieldDefinition(relInfo.endField!!)!!.type.innerName()
("$childVariable${relInfo.endField.capitalize()}:$label" to relInfo.endField)
}
else -> ("$childVariable:${nodeType.name}" to null)
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/relationship-tests.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ RETURN team {
MATCH (player: Player)
RETURN player {
.id,
memberships: [(player)<-[playerMemberships: MEMBER_OF]-(playerMembershipsPlayer: Player) | playerMemberships {
team: playerMembershipsPlayer { .id },
memberships: [(player)-[playerMemberships: MEMBER_OF]->(playerMembershipsTeam: Team) | playerMemberships {
team: playerMembershipsTeam { .id },
.prop
}]
} AS player
Expand Down
31 changes: 14 additions & 17 deletions src/test/resources/translator-tests1.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ MATCH (person:Person) RETURN person { .age } AS person ORDER BY person.name ASC
.GraphQL-Query
[source,graphql]
----
{ person { name born { date to { name } } } }
{ person { name born { date to { name } } } }
----

.Cypher params
Expand All @@ -97,7 +97,7 @@ MATCH (person:Person) RETURN person { .name, born:[(person)-[personBorn:BORN]->(
.GraphQL-Query
[source,graphql]
----
{ person { name age livedIn { name } } }
{ person { name age livedIn { name } } }
----

.Cypher params
Expand Down Expand Up @@ -194,7 +194,7 @@ MATCH (person:Person) RETURN person { .age } AS person SKIP $personOffset
.GraphQL-Query
[source,graphql]
----
{ person { name age livesIn { name } } }
{ person { name age livesIn { name } } }
----

.Cypher params
Expand All @@ -214,7 +214,7 @@ MATCH (person:Person) RETURN person { .name, .age, livesIn:[(person)-[:LIVES_IN]
.GraphQL-Query
[source,graphql]
----
{ person { name age } }
{ person { name age } }
----

.Cypher params
Expand Down Expand Up @@ -254,7 +254,7 @@ MATCH (person:Person) RETURN person { .name } AS person
.GraphQL-Query
[source,graphql]
----
{ person { name died { date where { name } } } }
{ person { name died { date where { name } } } }
----

.Cypher params
Expand All @@ -274,7 +274,7 @@ MATCH (person:Person) RETURN person { .name, died:[(person)-[personDied:DIED]->(
.GraphQL-Query
[source,graphql]
----
{ person { name born { date to { name founded { name } } } } }
{ person { name born { date to { name founded { name } } } } }
----

.Cypher params
Expand Down Expand Up @@ -306,7 +306,7 @@ RETURN person {
.GraphQL-Query
[source,graphql]
----
{ person { name born { date to { name founded { name born { date to { name } } } } } } }
{ person { name born { date to { name founded { name born { date to { name } } } } } } }
----

.Cypher params
Expand All @@ -326,7 +326,7 @@ MATCH (person:Person) RETURN person { .name, born:[(person)-[personBorn:BORN]->(
.GraphQL-Query
[source,graphql]
----
{ person { name age livesIn(name:"Berlin") { name } } }
{ person { name age livesIn(name:"Berlin") { name } } }
----

.Cypher params
Expand Down Expand Up @@ -408,7 +408,7 @@ MATCH (person:Person) RETURN person { .name, .age } AS person
.GraphQL-Query
[source,graphql]
----
{ foo:person { n:name } }
{ foo:person {n:name } }
----

.Cypher params
Expand Down Expand Up @@ -516,7 +516,7 @@ SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further detail
.GraphQL-Query
[source,graphql]
----
{ person { livedIn(offset:3) { name } } }
{ person { livedIn(offset:3) { name } } }
----

.Cypher params
Expand All @@ -543,7 +543,7 @@ RETURN person {
.GraphQL-Query
[source,graphql]
----
{ person { livedIn(first:2) { name } } }
{ person { livedIn(first:2) { name } } }
----

.Cypher params
Expand All @@ -565,14 +565,12 @@ RETURN person {
} AS person
----

line 1:15 token recognition error at: ' '
line 1:35 token recognition error at: ' '
=== nested query 2 nd hop

.GraphQL-Query
[source,graphql]
----
{ person { name age livesIn { name founded {name}} } }
{ person { name age livesIn { name founded {name}} } }
----

.Cypher params
Expand All @@ -587,13 +585,12 @@ line 1:35 token recognition error at: ' '
MATCH (person:Person) RETURN person { .name, .age, livesIn:[(person)-[:LIVES_IN]->(personLivesIn:Location) | personLivesIn { .name, founded:[(personLivesIn)<-[:FOUNDED]-(personLivesInFounded:Person) | personLivesInFounded { .name }][0] }][0] } AS person
----

line 1:12 token recognition error at: ' '
=== inline fragment multi fields

.GraphQL-Query
[source,graphql]
----
query { person { ... on Person { name,age } } }
query { person { ... on Person { name,age } } }
----

.Cypher params
Expand Down Expand Up @@ -637,7 +634,7 @@ RETURN person { .age } AS person SKIP $personOffset LIMIT $personFirst
.GraphQL-Query
[source,graphql]
----
{ person { livedIn(first:2,offset:3) { name } } }
{ person { livedIn(first:2,offset:3) { name } } }
----

.Cypher params
Expand Down