Merge pull request #2673 from prismagraphql/bugfix-related-field

bugfix: related field must not blow up when the related field has the same name

server/servers/deploy/src/test/scala/com/prisma/shared/models/ModelsSpec.scala

@@ -0,0 +1,20 @@
+package com.prisma.shared.models
+
+import com.prisma.deploy.connector.MissingBackRelations
+import com.prisma.shared.schema_dsl.SchemaDsl
+import org.scalatest.{FlatSpec, Matchers}
+
+class ModelsSpec extends FlatSpec with Matchers {
+  "a related field" should "be found when the related fields have the same name" in {
+    val builder = SchemaDsl()
+    val model1  = builder.model("Model1")
+    val model2  = builder.model("Model2")
+    model1.oneToOneRelation("field", "field", model2)
+    val project           = builder.buildProject()
+    val withBackRelations = MissingBackRelations.add(project.schema) // should not blow up
+
+    withBackRelations.allRelationFields.foreach { rf =>
+      rf.relatedField // let's see whether this blows up
+    }
+  }
+}

server/shared-models/src/main/scala/com/prisma/shared/models/Field.scala

@@ -156,12 +156,16 @@ case class RelationField(
   }
 
   lazy val relatedField: RelationField = {
-    relatedModel_!.relationFields.find { field =>
-      val relation          = field.relation
-      val isTheSameField    = field.name == this.name
-      val isTheSameRelation = relation.relationTableName == this.relation.relationTableName
-      isTheSameRelation && !isTheSameField
-    }.get
+    relatedModel_!.relationFields
+      .find { field =>
+        val relation          = field.relation
+        val isTheSameField    = field == this
+        val isTheSameRelation = relation == this.relation
+        isTheSameRelation && !isTheSameField
+      }
+      .getOrElse {
+        sys.error(s"Could not find related field of $name on model ${model.name}. Relation is ${relation.name}")
+      }
   }
 
   lazy val oppositeRelationSide: RelationSide.Value = {