Merge bugfix for DBAL-147 into 2.1.x

3e6dafb9 · Benjamin Eberlei · aa24af28 · 3e6dafb9
Commit 3e6dafb9 authored Aug 27, 2011 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

PostgreSqlSchemaManager.php lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php +2 -2

No files found.
--- a/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -38,10 +38,10 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
        $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];
        }