RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-05 20:36:15 +03:00
Code Issues Projects Releases Wiki Activity

- use ATTR_DECIMAL_PLACES when defining a decimal field

Browse Source
This commit is contained in:
lsmith 2007-05-11 19:13:20 +00:00
parent 4d1722fba4
commit efc7baa19b
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/DataDict/Firebird.php
View File

@ -93,7 +93,7 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
return 'DOUBLE PRECISION'; return 'DOUBLE PRECISION';
case 'decimal': case 'decimal':
$length = !empty($field['length']) ? $field['length'] : 18; $length = !empty($field['length']) ? $field['length'] : 18;
return 'DECIMAL(' . $length.',' . $this->conn->options['decimal_places'] . ')'; return 'DECIMAL('.$length.','.$this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES).')';
} }
throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.'); throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.');

2
lib/Doctrine/DataDict/Mssql.php
View File

@ -108,7 +108,7 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
return 'FLOAT'; return 'FLOAT';
case 'decimal': case 'decimal':
$length = !empty($field['length']) ? $field['length'] : 18; $length = !empty($field['length']) ? $field['length'] : 18;
return 'DECIMAL('.$length.','.$this->conn->options['decimal_places'].')'; return 'DECIMAL('.$length.','.$this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES).')';
} }
throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.'); throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.');

3
lib/Doctrine/DataDict/Mysql.php
View File

@ -216,7 +216,8 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
return 'DOUBLE'; return 'DOUBLE';
case 'decimal': case 'decimal':
$length = !empty($field['length']) ? $field['length'] : 18; $length = !empty($field['length']) ? $field['length'] : 18;
return 'DECIMAL(' . $length . ',' . 0 . ')'; //$this->dbh->options['decimal_places'] . ')'; var_dump('DECIMAL('.$length.','.$this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES).')');
return 'DECIMAL('.$length.','.$this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES).')';
} }
throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.'); throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.');
} }

2
lib/Doctrine/DataDict/Oracle.php
View File

@ -92,7 +92,7 @@ class Doctrine_DataDict_Oracle extends Doctrine_DataDict
case 'double': case 'double':
return 'NUMBER'; return 'NUMBER';
case 'decimal': case 'decimal':
return 'NUMBER(*,'.$this->conn->options['decimal_places'].')'; return 'NUMBER(*,'.$this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES).')';
default: default:
} }
throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.'); throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] . '\'.');

1
lib/Doctrine/Manager.php
View File

@ -115,6 +115,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
Doctrine::ATTR_SEQCOL_NAME => 'id', Doctrine::ATTR_SEQCOL_NAME => 'id',
Doctrine::ATTR_PORTABILITY => Doctrine::PORTABILITY_ALL, Doctrine::ATTR_PORTABILITY => Doctrine::PORTABILITY_ALL,
Doctrine::ATTR_EXPORT => Doctrine::EXPORT_NONE, Doctrine::ATTR_EXPORT => Doctrine::EXPORT_NONE,
Doctrine::ATTR_DECIMAL_PLACES => 2,
); );
foreach ($attributes as $attribute => $value) { foreach ($attributes as $attribute => $value) {
$old = $this->getAttribute($attribute); $old = $this->getAttribute($attribute);