Merge pull request #487 from havvg/hotfix/fk-migrations

migrations don't report equal FK behavior
propelorm · Oct 22, 2012 · 65def77 · 65def77
2 parents 51983e4 + 04e6a7c
commit 65def77
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/generator/lib/model/diff/PropelForeignKeyComparator.php b/generator/lib/model/diff/PropelForeignKeyComparator.php
@@ -62,11 +62,22 @@ public static function computeDiff(ForeignKey $fromFk, ForeignKey $toFk, $caseIn
             return true;
         }
 
-        // compare on
-        if ($fromFk->normalizeFKey($fromFk->getOnUpdate()) != $toFk->normalizeFKey($toFk->getOnUpdate())) {
+
+        /*
+         * Compare onDelete and onUpdate:
+         *
+         * "RESTRICT" and its synonym "NO ACTION" is default and is not being reported explicitly.
+         */
+        $equalBehavior = array('', 'RESTRICT', 'NO ACTION');
+
+        $fromOnUpdate = strtoupper($fromFk->normalizeFKey($fromFk->getOnUpdate()));
+        $toOnUpdate = strtoupper($toFk->normalizeFKey($toFk->getOnUpdate()));
+        if ((in_array($fromOnUpdate, $equalBehavior) && !in_array($toOnUpdate, $equalBehavior)) || (!in_array($fromOnUpdate, $equalBehavior) && in_array($toOnUpdate, $equalBehavior))) {
             return true;
         }
-        if ($fromFk->normalizeFKey($fromFk->getOnDelete()) != $toFk->normalizeFKey($toFk->getOnDelete())) {
+        $fromOnDelete = strtoupper($fromFk->normalizeFKey($fromFk->getOnDelete()));
+        $toOnDelete = strtoupper($toFk->normalizeFKey($toFk->getOnDelete()));
+        if ((in_array($fromOnDelete, $equalBehavior) && !in_array($toOnDelete, $equalBehavior)) || (!in_array($fromOnDelete, $equalBehavior) && in_array($toOnDelete, $equalBehavior))) {
             return true;
         }