php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-23 18:18:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4020 from Sanya1991/master

Browse Source 
OCI createColumn fix
This commit is contained in:
Carsten Brandt
2014-06-26 12:58:21 +02:00
parent 1b4a9b62cd 3f27a4b74f
commit 4f86c9ad51
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/oci/Schema.php
View File

@@ -27,7 +27,7 @@ class Schema extends \yii\db\Schema
{ {
parent::init(); parent::init();
if ($this->defaultSchema === null) { if ($this->defaultSchema === null) {
$this->defaultSchema = $this->db->username; $this->defaultSchema = strtoupper($this->db->username);
} }
} }
@@ -170,7 +170,7 @@ EOD;
$this->extractColumnType($c, $column['DATA_TYPE']); $this->extractColumnType($c, $column['DATA_TYPE']);
$this->extractColumnSize($c, $column['DATA_TYPE']); $this->extractColumnSize($c, $column['DATA_TYPE']);
if (!$column->isPrimaryKey) { if (!$c->isPrimaryKey) {
if (stripos($column['DATA_DEFAULT'], 'timestamp') !== false) { if (stripos($column['DATA_DEFAULT'], 'timestamp') !== false) {
$c->defaultValue = null; $c->defaultValue = null;
} else { } else {