Commit 41792429 authored by zYne's avatar zYne

Updated datadict drivers

parent eb6dde75
...@@ -30,7 +30,7 @@ Doctrine::autoload('Doctrine_DataDict'); ...@@ -30,7 +30,7 @@ Doctrine::autoload('Doctrine_DataDict');
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
*/ */
class Doctrine_DataDict_Firebird extends Doctrine_DataDict { class Doctrine_DataDict_Firebird extends Doctrine_Connection_Module {
/** /**
* Obtain DBMS specific SQL code portion needed to declare an text type * Obtain DBMS specific SQL code portion needed to declare an text type
* field to be used in statements like CREATE TABLE. * field to be used in statements like CREATE TABLE.
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
*/ */
class Doctrine_DataDict_Mssql extends Doctrine_DataDict { class Doctrine_DataDict_Mssql extends Doctrine_Connection_Module {
/** /**
* Obtain DBMS specific SQL code portion needed to declare an text type * Obtain DBMS specific SQL code portion needed to declare an text type
* field to be used in statements like CREATE TABLE. * field to be used in statements like CREATE TABLE.
......
...@@ -53,7 +53,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict { ...@@ -53,7 +53,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict {
* @return string DBMS specific SQL code portion that should be used to * @return string DBMS specific SQL code portion that should be used to
* declare the specified field. * declare the specified field.
*/ */
public function getTypeDeclaration($field) { public function getNativeDeclaration($field) {
switch ($field['type']) { switch ($field['type']) {
case 'array': case 'array':
case 'object': case 'object':
...@@ -127,10 +127,9 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict { ...@@ -127,10 +127,9 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict {
* Maps a native array description of a field to a MDB2 datatype and length * Maps a native array description of a field to a MDB2 datatype and length
* *
* @param array $field native field description * @param array $field native field description
* @author Lukas Smith (PEAR MDB2 library)
* @return array containing the various possible types, length, sign, fixed * @return array containing the various possible types, length, sign, fixed
*/ */
public function mapNativeDatatype($field) { public function getDoctrineDeclaration($field) {
$db_type = strtolower($field['type']); $db_type = strtolower($field['type']);
$db_type = strtok($db_type, '(), '); $db_type = strtok($db_type, '(), ');
if ($db_type == 'national') { if ($db_type == 'national') {
...@@ -328,8 +327,10 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict { ...@@ -328,8 +327,10 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict {
$notnull = empty($field['notnull']) ? '' : ' NOT NULL'; $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
$unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED'; $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
$name = $this->conn->quoteIdentifier($name, true); $name = $this->conn->quoteIdentifier($name, true);
return $name . ' ' . $this->getTypeDeclaration($field) . $unsigned . $default . $notnull . $autoinc;
return $name . ' ' . $this->getNativeDeclaration($field) . $unsigned . $default . $notnull . $autoinc;
} }
/** /**
* lists all databases * lists all databases
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
*/ */
class Doctrine_DataDict_Pgsql extends Doctrine_DataDict { class Doctrine_DataDict_Pgsql extends Doctrine_Connection_Module {
/** /**
* @param array $reservedKeyWords an array of reserved keywords by pgsql * @param array $reservedKeyWords an array of reserved keywords by pgsql
*/ */
......
...@@ -29,7 +29,7 @@ Doctrine::autoload('Doctrine_DataDict'); ...@@ -29,7 +29,7 @@ Doctrine::autoload('Doctrine_DataDict');
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
*/ */
class Doctrine_DataDict_Sqlite extends Doctrine_DataDict { class Doctrine_DataDict_Sqlite extends Doctrine_Connection_Module {
/** /**
* Obtain DBMS specific SQL code portion needed to declare an text type * Obtain DBMS specific SQL code portion needed to declare an text type
* field to be used in statements like CREATE TABLE. * field to be used in statements like CREATE TABLE.
...@@ -202,10 +202,12 @@ class Doctrine_DataDict_Sqlite extends Doctrine_DataDict { ...@@ -202,10 +202,12 @@ class Doctrine_DataDict_Sqlite extends Doctrine_DataDict {
case 'double': case 'double':
case 'real': case 'real':
$type[] = 'float'; $type[] = 'float';
$length = null;
break; break;
case 'decimal': case 'decimal':
case 'numeric': case 'numeric':
$type[] = 'decimal'; $type[] = 'decimal';
$length = null;
break; break;
case 'tinyblob': case 'tinyblob':
case 'mediumblob': case 'mediumblob':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment