Commit 4f86c9ad by Carsten Brandt

Merge pull request #4020 from Sanya1991/master

OCI createColumn fix
parents 1b4a9b62 3f27a4b7
...@@ -27,7 +27,7 @@ class Schema extends \yii\db\Schema ...@@ -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; ...@@ -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 {
......
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