Skip to content

D
doctrine-dbal
Commit f998aff6 authored by zYne's avatar zYne
Browse files
Options

added Firebird exception class

parent 6239c4b3
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 129 deletions
lib/Doctrine/DataDict/Firebird.php
View file @ f998aff6
...@@ -107,71 +107,72 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict ...@@ -107,71 +107,72 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
$type = array(); $type = array();
$unsigned = $fixed = null; $unsigned = $fixed = null;
$db_type = strtolower($field['type']); $dbType = strtolower($field['type']);
$field['field_sub_type'] = !empty($field['field_sub_type']) $field['field_sub_type'] = !empty($field['field_sub_type'])
? strtolower($field['field_sub_type']) : null; ? strtolower($field['field_sub_type']) : null;
switch ($db_type) {
case 'smallint': switch ($dbType) {
case 'integer': case 'smallint':
case 'int64': case 'integer':
//these may be 'numeric' or 'decimal' case 'int64':
if (isset($field['field_sub_type'])) { //these may be 'numeric' or 'decimal'
$field['type'] = $field['field_sub_type']; if (isset($field['field_sub_type'])) {
return $this->mapNativeDatatype($field); $field['type'] = $field['field_sub_type'];
} return $this->getPortableDeclaration($field);
case 'bigint':
case 'quad':
$type[] = 'integer';
if ($length == '1') {
$type[] = 'boolean';
if (preg_match('/^(is|has)/', $field['name'])) {
$type = array_reverse($type);
} }
} case 'bigint':
break; case 'quad':
case 'varchar': $type[] = 'integer';
$fixed = false; if ($length == '1') {
case 'char': $type[] = 'boolean';
case 'cstring': if (preg_match('/^(is|has)/', $field['name'])) {
$type[] = 'text'; $type = array_reverse($type);
if ($length == '1') { }
$type[] = 'boolean';
if (preg_match('/^(is|has)/', $field['name'])) {
$type = array_reverse($type);
} }
}
if ($fixed !== false) {
$fixed = true;
}
break;
case 'date':
$type[] = 'date';
$length = null;
break;
case 'timestamp':
$type[] = 'timestamp';
$length = null;
break; break;
case 'time': case 'varchar':
$type[] = 'time'; $fixed = false;
$length = null; case 'char':
break; case 'cstring':
case 'float': $type[] = 'text';
case 'double': if ($length == '1') {
case 'double precision': $type[] = 'boolean';
case 'd_float': if (preg_match('/^(is|has)/', $field['name'])) {
$type[] = 'float'; $type = array_reverse($type);
}
}
if ($fixed !== false) {
$fixed = true;
}
break; break;
case 'decimal': case 'date':
case 'numeric': $type[] = 'date';
$type[] = 'decimal'; $length = null;
break; break;
case 'blob': case 'timestamp':
$type[] = ($field['field_sub_type'] == 'text') ? 'clob' : 'blob'; $type[] = 'timestamp';
$length = null; $length = null;
break; break;
default: case 'time':
throw new Doctrine_DataDict_Firebird_Exception('unknown database attribute type: '.$db_type); $type[] = 'time';
$length = null;
break;
case 'float':
case 'double':
case 'double precision':
case 'd_float':
$type[] = 'float';
break;
case 'decimal':
case 'numeric':
$type[] = 'decimal';
break;
case 'blob':
$type[] = ($field['field_sub_type'] == 'text') ? 'clob' : 'blob';
$length = null;
break;
default:
throw new Doctrine_DataDict_Firebird_Exception('unknown database attribute type: '.$dbType);
} }
return array($type, $length, $unsigned, $fixed); return array($type, $length, $unsigned, $fixed);
......
lib/Doctrine/DataDict/Firebird/Exception.php 0 → 100644
View file @ f998aff6
<?php
/*
* $Id$
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DataDict_Exception');
/**
* Doctrine_DataDict_Sqlite_Exception
*
* @package Doctrine
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @category Object Relational Mapping
* @link www.phpdoctrine.com
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
class Doctrine_DataDict_Firebird_Exception extends Doctrine_DataDict_Exception
{ }
lib/Doctrine/DataDict/Mysql.php
View file @ f998aff6
...@@ -134,82 +134,82 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict ...@@ -134,82 +134,82 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
public function getNativeDeclaration($field) public function getNativeDeclaration($field)
{ {
switch ($field['type']) { switch ($field['type']) {
case 'char': case 'char':
$length = (! empty($field['length'])) ? $field['length'] : false; $length = (! empty($field['length'])) ? $field['length'] : false;
return $length ? 'CHAR('.$length.')' : 'CHAR(255)'; return $length ? 'CHAR('.$length.')' : 'CHAR(255)';
case 'varchar': case 'varchar':
case 'array': case 'array':
case 'object': case 'object':
case 'string': case 'string':
if ( ! isset($field['length'])) { if ( ! isset($field['length'])) {
if (array_key_exists('default', $field)) { if (array_key_exists('default', $field)) {
$field['length'] = $this->conn->varchar_max_length; $field['length'] = $this->conn->varchar_max_length;
} else { } else {
$field['length'] = false; $field['length'] = false;
}
} }
}
$length = ($field['length'] < $this->conn->varchar_max_length) ? $field['length'] : false;
$length = ($field['length'] < $this->conn->varchar_max_length) ? $field['length'] : false; $fixed = (isset($field['fixed'])) ? $field['fixed'] : false;
$fixed = (isset($field['fixed'])) ? $field['fixed'] : false;
return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)')
return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)') : ($length ? 'VARCHAR(' . $length . ')' : 'TEXT');
: ($length ? 'VARCHAR(' . $length . ')' : 'TEXT'); case 'clob':
case 'clob': if (!empty($field['length'])) {
if (!empty($field['length'])) { $length = $field['length'];
$length = $field['length']; if ($length <= 255) {
if ($length <= 255) { return 'TINYTEXT';
return 'TINYTEXT'; } elseif ($length <= 65532) {
} elseif ($length <= 65532) { return 'TEXT';
return 'TEXT'; } elseif ($length <= 16777215) {
} elseif ($length <= 16777215) { return 'MEDIUMTEXT';
return 'MEDIUMTEXT'; }
} }
} return 'LONGTEXT';
return 'LONGTEXT'; case 'blob':
case 'blob': if (!empty($field['length'])) {
if (!empty($field['length'])) { $length = $field['length'];
$length = $field['length']; if ($length <= 255) {
if ($length <= 255) { return 'TINYBLOB';
return 'TINYBLOB'; } elseif ($length <= 65532) {
} elseif ($length <= 65532) { return 'BLOB';
return 'BLOB'; } elseif ($length <= 16777215) {
} elseif ($length <= 16777215) { return 'MEDIUMBLOB';
return 'MEDIUMBLOB'; }
} }
} return 'LONGBLOB';
return 'LONGBLOB'; case 'integer':
case 'integer': case 'enum':
case 'enum': if (!empty($field['length'])) {
if (!empty($field['length'])) { $length = $field['length'];
$length = $field['length']; if ($length <= 1) {
if ($length <= 1) { return 'TINYINT';
return 'TINYINT'; } elseif ($length == 2) {
} elseif ($length == 2) { return 'SMALLINT';
return 'SMALLINT'; } elseif ($length == 3) {
} elseif ($length == 3) { return 'MEDIUMINT';
return 'MEDIUMINT'; } elseif ($length == 4) {
} elseif ($length == 4) { return 'INT';
return 'INT'; } elseif ($length > 4) {
} elseif ($length > 4) { return 'BIGINT';
return 'BIGINT'; }
} }
} return 'INT';
return 'INT'; case 'boolean':
case 'boolean': return 'TINYINT(1)';
return 'TINYINT(1)'; case 'date':
case 'date': return 'DATE';
return 'DATE'; case 'time':
case 'time': return 'TIME';
return 'TIME'; case 'timestamp':
case 'timestamp': return 'DATETIME';
return 'DATETIME'; case 'float':
case 'float': 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'] . ')';
return 'DECIMAL(' . $length . ',' . 0 . ')'; //$this->dbh->options['decimal_places'] . ')';
} }
return ''; return '';
} }
......
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