Merge branch 'DBAL-106'

lib/Doctrine/DBAL/Schema/Column.php

@@ -159,6 +159,10 @@ class Column extends AbstractAsset
      */
     public function setPrecision($precision)
     {
+        if (!is_numeric($precision)) {
+            $precision = 10; // defaults to 10 when no valid precision is given.
+        }
+
         $this->_precision = (int)$precision;
         return $this;
     }
@@ -169,7 +173,11 @@ class Column extends AbstractAsset
      */
     public function setScale($scale)
     {
-        $this->_scale = $scale;
+        if (!is_numeric($scale)) {
+            $scale = 0;
+        }
+
+        $this->_scale = (int)$scale;
         return $this;
     }
 

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -335,7 +335,7 @@ class Comparator
         }
 
         if ($column1->getType() instanceof \Doctrine\DBAL\Types\DecimalType) {
-            if ($column1->getPrecision() != $column2->getPrecision()) {
+            if (($column1->getPrecision()?:10) != ($column2->getPrecision()?:10)) {
                 $changedProperties[] = 'precision';
             }
             if ($column1->getScale() != $column2->getScale()) {

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

@@ -653,6 +653,20 @@ class ComparatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(0, count($tableDiff->removedColumns));
     }
 
+    /**
+     * @group DBAL-106
+     */
+    public function testDiffDecimalWithNullPrecision()
+    {
+        $column = new Column('foo', Type::getType('decimal'));
+        $column->setPrecision(null);
+
+        $column2 = new Column('foo', Type::getType('decimal'));
+
+        $c = new Comparator();
+        $this->assertEquals(array(), $c->diffColumn($column, $column2));
+    }
+
     /**
      * @param SchemaDiff $diff
      * @param int $newTableCount