Skip to content

Commit

Permalink
Fixed Oracle DB type mapping. (Fixes #4)
Browse files Browse the repository at this point in the history
  • Loading branch information
qiangxue committed Jul 25, 2014
1 parent 65d0842 commit 1f0d2ab
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
22 changes: 22 additions & 0 deletions framework/db/oci/QueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,28 @@
*/
class QueryBuilder extends \yii\db\QueryBuilder
{
/**
* @var array mapping from abstract column types (keys) to physical column types (values).
*/
public $typeMap = [
Schema::TYPE_PK => 'NUMBER(10) NOT NULL PRIMARY KEY',
Schema::TYPE_BIGPK => 'NUMBER(20) NOT NULL PRIMARY KEY',
Schema::TYPE_STRING => 'VARCHAR2(255)',
Schema::TYPE_TEXT => 'CLOB',
Schema::TYPE_SMALLINT => 'NUMBER(5)',
Schema::TYPE_INTEGER => 'NUMBER(10)',
Schema::TYPE_BIGINT => 'NUMBER(20)',
Schema::TYPE_FLOAT => 'NUMBER',
Schema::TYPE_DECIMAL => 'NUMBER',
Schema::TYPE_DATETIME => 'TIMESTAMP',
Schema::TYPE_TIMESTAMP => 'TIMESTAMP',
Schema::TYPE_TIME => 'TIMESTAMP',
Schema::TYPE_DATE => 'DATE',
Schema::TYPE_BINARY => 'BLOB',
Schema::TYPE_BOOLEAN => 'NUMBER(1)',
Schema::TYPE_MONEY => 'NUMBER(19,4)',
];

private $_sql;

/**
Expand Down
16 changes: 0 additions & 16 deletions framework/db/oci/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,11 @@
/**
* Schema is the class for retrieving metadata from an Oracle database
*
* @todo mapping from physical types to abstract types
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
class Schema extends \yii\db\Schema
{
const TYPE_PK = 'NUMBER(10) NOT NULL PRIMARY KEY';
const TYPE_STRING = 'VARCHAR2(255)';
const TYPE_TEXT = 'CLOB';
const TYPE_INTEGER = 'NUMBER(10)';
const TYPE_FLOAT = 'NUMBER';
const TYPE_DECIMAL = 'NUMBER';
const TYPE_DATETIME = 'TIMESTAMP';
const TYPE_TIMESTAMP = 'TIMESTAMP';
const TYPE_TIME = 'TIMESTAMP';
const TYPE_DATE = 'DATE';
const TYPE_BINARY = 'BLOB';
const TYPE_BOOLEAN = 'NUMBER(1)';
const TYPE_MONEY = 'NUMBER(19,4)';
/**
* @inheritdoc
*/
Expand Down Expand Up @@ -172,7 +157,6 @@ protected function findColumns($table)
* @internal param \yii\db\TableSchema $table ->name the table schema
* @return string whether the sequence exists
*/

protected function getTableSequenceName($tablename){

$seq_name_sql="select ud.referenced_name as sequence_name
Expand Down

0 comments on commit 1f0d2ab

Please sign in to comment.