Merge pull request #898 from kairichard/fix-default-type-size-with-scale

Fix default type size with scale
propelorm · Mar 23, 2015 · e6e18a2 · e6e18a2
2 parents 8bd5656 + b9eff7b
commit e6e18a2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php
@@ -1400,7 +1400,7 @@ public function normalizeTable(Table $table)
 
         foreach ($table->getColumns() as $column) {
             if ($column->getSize() && $defaultSize = $this->getDefaultTypeSize($column->getType())) {
-                if (intval($column->getSize()) === $defaultSize) {
+                if (null === $column->getScale() && intval($column->getSize()) === $defaultSize) {
                     $column->setSize(null);
                 }
             }

diff --git a/src/Propel/Generator/Reverse/MysqlSchemaParser.php b/src/Propel/Generator/Reverse/MysqlSchemaParser.php
@@ -207,7 +207,7 @@ public function getColumnFromRow($row, Table $table)
             if ($matches[3]) {
                 $sqlType = $row['Type'];
             }
-            if (isset(static::$defaultTypeSizes[$nativeType]) && $size === static::$defaultTypeSizes[$nativeType]) {
+            if (isset(static::$defaultTypeSizes[$nativeType]) && null == $scale && $size === static::$defaultTypeSizes[$nativeType]) {
                 $size = null;
             }
         } elseif (preg_match('/^(\w+)\(/', $row['Type'], $matches)) {

diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php
@@ -839,4 +839,19 @@ public function testVendorOptionsQuoting()
         $this->assertEquals($expected, $this->getPlatform()->getAddTableDDL($table));
     }
 
+
+    public function testNormalizeTable()
+    {
+        $column = new Column('price', 'DECIMAL');
+        $column->getDomain()->copy($this->getPlatform()->getDomainForType('DECIMAL'));
+        $column->setSize(10);
+        $column->setScale(3);
+        $table = new Table('prices');
+        $table->addColumns([$column]);
+        $this->getPlatform()->normalizeTable($table);
+        $this->assertEquals("`price` DECIMAL(10,3)", $this->getPlatform()->getColumnDDL($column));
+    }
+
+
+
 }