diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index ad4c39a9935350c9fad23227a5defc7702fc87fe..511bd1c90bd85921f83536e65bf329dd369b28f5 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -150,6 +150,9 @@ class MDB2SchemaReader { case 'timestamp': $type = 'datetime'; break; + case 'numeric': + $type = 'decimal'; + break; } break; case 'length': @@ -193,7 +196,7 @@ class MDB2SchemaReader { } else { $options['default'] = ''; } - if ($type == 'integer') { + if ($type == 'integer' || $type == 'decimal') { $options['default'] = 0; } elseif ($type == 'boolean') { $options['default'] = false; diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml index 2e83bbb78c7577d3aef0c5b6039f12598ef36073..5f2edbbc5160ff4a8282ff4ddb7e6c125b9368e9 100644 --- a/tests/data/db_structure.xml +++ b/tests/data/db_structure.xml @@ -199,4 +199,26 @@ </declaration> </table> + <table> + <name>*dbprefix*decimal</name> + <declaration> + <field> + <name>id</name> + <autoincrement>1</autoincrement> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>4</length> + </field> + + <field> + <name>decimaltest</name> + <type>decimal</type> + <default/> + <notnull>true</notnull> + <length>15</length> + </field> + </declaration> + </table> + </database> diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml index bbfb24985cb1c67c4628f4b10448b0df35bc56d9..6cd071451df58072840b8daa7e933b9fd5a104e6 100644 --- a/tests/data/db_structure2.xml +++ b/tests/data/db_structure2.xml @@ -96,4 +96,26 @@ </declaration> </table> + <table> + <name>*dbprefix*decimal</name> + <declaration> + <field> + <name>id</name> + <autoincrement>1</autoincrement> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>4</length> + </field> + + <field> + <name>decimaltest</name> + <type>decimal</type> + <default/> + <notnull>true</notnull> + <length>15</length> + </field> + </declaration> + </table> + </database>