Merge pull request #18 from richardfullmer/master

Support for Postgres SET NULL, SET DEFAULT, and NO ACTION foreign key detection in the PostgresSQLSchema Manager
doctrine · Jul 12, 2011 · 2434d95 · 2434d95
2 parents 5d4d171 + 208f995
commit 2434d95
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php b/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -38,10 +38,10 @@ protected function _getPortableTableForeignKeyDefinition($tableForeignKey)
         $onUpdate = null;
         $onDelete = null;
 
-        if (preg_match('(ON UPDATE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
+        if (preg_match('(ON UPDATE ([a-zA-Z0-9]+( (NULL|ACTION|DEFAULT))?))', $tableForeignKey['condef'], $match)) {
             $onUpdate = $match[1];
         }
-        if (preg_match('(ON DELETE ([a-zA-Z0-9]+))', $tableForeignKey['condef'], $match)) {
+        if (preg_match('(ON DELETE ([a-zA-Z0-9]+( (NULL|ACTION|DEFAULT))?))', $tableForeignKey['condef'], $match)) {
             $onDelete = $match[1];
         }