Temporary fix for issues appearing due to DBAL-2 reopening, found an actual...

Temporary fix for issues appearing due to DBAL-2 reopening, found an actual additional bug that is now fixed in PostgresSQL Schema Manager

Fix change to Postgresql NULL Column detection

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -325,17 +325,6 @@ class Comparator
             }
         }
 
-        foreach ($column1->getPlatformOptions() AS $optionName => $optionValue) {
-            if (!$column2->hasPlatformOption($optionName) || $optionValue != $column2->getPlatformOption($optionName)) {
-                $changedProperties[] = $optionName;
-            }
-        }
-        foreach ($column2->getPlatformOptions() AS $optionName => $optionValue) {
-            if (!$column1->hasPlatformOption($optionName)) {
-                $changedProperties[] = $optionName;
-            }
-        }
-
         return $changedProperties;
     }
 

lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php

 <?php
 /*
- *  $Id$
- *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -176,7 +174,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
             $tableColumn['default'] = null;
         }
         
-        if (stripos($tableColumn['default'], 'NULL') !== null) {
+        if (stripos($tableColumn['default'], 'NULL') === 0) {
             $tableColumn['default'] = null;
         }
         

tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php

@@ -572,6 +572,8 @@ class ComparatorTest extends \PHPUnit_Framework_TestCase
 
     public function testDetectChangeIdentifierType()
     {
+        $this->markTestSkipped('DBAL-2 was reopened, this test cannot work anymore.');
+
         $tableA = new Table("foo");
         $tableA->addColumn('id', 'integer', array('platformOptions' => array('autoincrement' => false)));