Merge 33aeaadd from master

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -371,4 +371,4 @@ class Comparator
 
         return false;
     }
-}
\ No newline at end of file
+}

lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php

@@ -178,7 +178,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
             $autoincrement = true;
         }
         
-        if (stripos($tableColumn['default'], 'NULL') !== null) {
+        if ($tableColumn['default'] == 'NULL') {
             $tableColumn['default'] = null;
         }
         

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

@@ -583,6 +583,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)));