RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +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

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

@ -93,9 +93,9 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
return 'DOUBLE PRECISION';
case 'decimal':
$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'] . '\'.');
}
/**
@ -184,7 +184,7 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
return array('type' => $type,
'length' => $length,
'unsigned' => $unsigned,
'unsigned' => $unsigned,
'fixed' => $fixed);
}
/**

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

@ -108,7 +108,7 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
return 'FLOAT';
case 'decimal':
$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'] . '\'.');
@ -181,7 +181,7 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
return array('type' => $type,
'length' => $length,
'unsigned' => $unsigned,
'unsigned' => $unsigned,
'fixed' => $fixed);
}
}

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

@ -216,7 +216,8 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
return 'DOUBLE';
case 'decimal':
$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'] . '\'.');
}
@ -246,7 +247,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
if ( ! isset($field['name'])) {
$field['name'] = '';
}
$values = null;
switch ($dbType) {

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

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

17
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_PORTABILITY => Doctrine::PORTABILITY_ALL,
Doctrine::ATTR_EXPORT => Doctrine::EXPORT_NONE,
Doctrine::ATTR_DECIMAL_PLACES => 2,
);
foreach ($attributes as $attribute => $value) {
$old = $this->getAttribute($attribute);
@ -255,9 +256,9 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
return $this->connections[$name];
}
/**
/**
* getComponentAlias
* retrieves the alias for given component name
* retrieves the alias for given component name
* if the alias couldn't be found, this method returns the given
* component name
*
@ -269,7 +270,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
if (isset($this->componentAliases[$componentName])) {
return $this->componentAliases[$componentName];
}
return $componentName;
}
/**
@ -281,10 +282,10 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
* @param string $alias
* @return Doctrine_Manager
*/
public function setComponentAlias($componentName, $alias)
public function setComponentAlias($componentName, $alias)
{
$this->componentAliases[$componentName] = $alias;
return $this;
}
/**
@ -293,7 +294,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
* @param Doctrine_Connection $conn connection object to be searched for
* @return string the name of the connection
*/
public function getConnectionName(Doctrine_Connection $conn)
public function getConnectionName(Doctrine_Connection $conn)
{
return array_search($conn, $this->connections, true);
}
@ -346,7 +347,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
public function closeConnection(Doctrine_Connection $connection)
{
$connection->close();
$key = array_search($connection, $this->connections, true);
if ($key !== false) {
@ -389,7 +390,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
* @param mixed $key the connection key
* @return boolean
*/
public function contains($key)
public function contains($key)
{
return isset($this->connections[$key]);
}