Fix false positive in ambiguous self-relation validation

Fix for prisma/prisma#488
prisma · Oct 1, 2019 · b05e313 · b05e313
1 parent 87115f5
commit b05e313
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 4 deletions.
diff --git a/libs/datamodel/src/dml/validator/validate.rs b/libs/datamodel/src/dml/validator/validate.rs
@@ -90,7 +90,7 @@ impl Validator {
 
             if !is_valid {
                 return Err(ValidationError::new_model_validation_error(
-                    "Invalid ID field. ID field must be one of: Int @id, String @id @default(cuid()), String @id @default(uuid()).", 
+                    "Invalid ID field. ID field must be one of: Int @id, String @id @default(cuid()), String @id @default(uuid()).",
                     &model.name,
                     ast_schema.find_field(&model.name, &id_field.name).expect(STATE_ERROR).span));
             }
@@ -156,7 +156,7 @@ impl Validator {
                                             .span,
                                     ));
                                 }
-                            } else {
+                            } else if rel_a.to == model.name && rel_b.to == model.name {
                                 // A self relation...
                                 for field_c in model.fields() {
                                     if field_a != field_c && field_b != field_c {

diff --git a/libs/datamodel/tests/directives/relations_positive.rs b/libs/datamodel/tests/directives/relations_positive.rs
@@ -67,3 +67,22 @@ fn allow_complicated_self_relations() {
     user_model.assert_has_field("husband").assert_relation_to("User");
     user_model.assert_has_field("wife").assert_relation_to("User");
 }
+
+#[test]
+fn allow_unambiguous_self_relations_in_presence_of_unrelated_other_relations() {
+    let dml = r#"
+        model User {
+            id Int @id
+            subscribers Follower[]
+            son User
+            mother User
+        }
+
+        model Follower {
+            id Int @id
+            following User[]
+        }
+    "#;
+
+    parse(dml);
+}
diff --git a/migration-engine/core/tests/datamodel_steps_inferrer_tests.rs b/migration-engine/core/tests/datamodel_steps_inferrer_tests.rs
@@ -78,7 +78,7 @@ fn infer_UpdateModel() {
         r#"
         model Post{
             id String @id @default(cuid())
-            
+
             @@embedded
         }
     "#,
@@ -336,6 +336,47 @@ fn infer_UpdateIndex() {
     assert_eq!(steps, expected);
 }
 
+#[test]
+fn infer_CreateField_on_self_relation() {
+    let dm1 = parse(
+        r#"
+            model User {
+                id Int @id
+            }
+        "#,
+    );
+
+    let dm2 = parse(
+        r#"
+            model User {
+                id Int @id
+                invitedBy User?
+            }
+        "#,
+    );
+
+    let steps = infer(&dm1, &dm2);
+
+    let expected = vec![MigrationStep::CreateField(CreateField {
+        model: "User".into(),
+        name: "invitedBy".into(),
+        tpe: FieldType::Relation(RelationInfo {
+            name: "UserToUser".into(),
+            on_delete: OnDeleteStrategy::None,
+            to: "User".into(),
+            to_fields: vec!["id".to_owned()],
+        }),
+        arity: FieldArity::Optional,
+        db_name: None,
+        is_created_at: None,
+        is_updated_at: None,
+        is_unique: false,
+        id: None,
+        default: None,
+        scalar_list: None,
+    })];
+}
+
 fn infer(dm1: &Datamodel, dm2: &Datamodel) -> Vec<MigrationStep> {
     let inferrer = DataModelMigrationStepsInferrerImplWrapper {};
     inferrer.infer(&dm1, &dm2)

diff --git a/migration-engine/core/tests/migration_tests.rs b/migration-engine/core/tests/migration_tests.rs
@@ -1208,7 +1208,7 @@ fn adding_a_scalar_list_for_a_modelwith_id_type_int_must_work() {
                 strings String[]
                 enums Status[]
             }
-            
+
             enum Status {
               OK
               ERROR
@@ -1283,3 +1283,25 @@ fn reserved_sql_key_words_must_work() {
         );
     });
 }
+
+#[test]
+fn migrations_with_self_relation_must_be_idempotent() {
+    // Issue: https://github.com/prisma/prisma2/issues/488
+    test_each_connector(|sql_family, api| {
+        let dm = r#"
+            model User {
+                id String @default(cuid()) @id
+            }
+        "#;
+
+        infer_and_apply(api, &dm);
+
+        let dm2 = r#"
+            model User {
+                id String @default(cuid()) @id
+                invitedBy User?
+            }
+        "#;
+        let schema_2 = infer_and_apply(api, &dm).sql_schema;
+    })
+}