From 9c55cc48f8e8985785e3f327f88b73785f593ac2 Mon Sep 17 00:00:00 2001 From: miramir Date: Mon, 7 Jul 2014 11:38:05 +0600 Subject: [PATCH 1/3] Removing unnecessary methods --- framework/db/oci/Schema.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php index 78e0c74074..be5a4d29da 100644 --- a/framework/db/oci/Schema.php +++ b/framework/db/oci/Schema.php @@ -52,22 +52,6 @@ class Schema extends \yii\db\Schema // does nothing as Oracle does not support this } - /** - * @inheritdoc - */ - public function quoteSimpleTableName($name) - { - return '"' . $name . '"'; - } - - /** - * @inheritdoc - */ - public function quoteSimpleColumnName($name) - { - return $name !== '*' ? '"' . $name . '"' : $name; - } - /** * @inheritdoc */ From 93c567e7e11000f453b40610a41bbcfc3d9d87e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=91=D0=B0=D0=B3=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2?= Date: Mon, 7 Jul 2014 20:54:31 +0600 Subject: [PATCH 2/3] Retriev quoteSimpleTableName --- framework/db/oci/Schema.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php index be5a4d29da..5b0423d3ce 100644 --- a/framework/db/oci/Schema.php +++ b/framework/db/oci/Schema.php @@ -96,6 +96,11 @@ class Schema extends \yii\db\Schema $table->fullName = $table->schemaName !== $this->defaultSchema ? $table->schemaName . '.' . $table->name : $table->name; } + + public function quoteSimpleTableName($name) + { + return strpos($name, '"') !== false ? $name : '"' . $name . '"'; + } /** * Collects the table column metadata. From 0322e427e7b6263ee39192bf1da6b2c3c5508ed6 Mon Sep 17 00:00:00 2001 From: miramir Date: Mon, 7 Jul 2014 21:24:21 +0600 Subject: [PATCH 3/3] fix unnecessary diff --- framework/db/oci/Schema.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php index 5b0423d3ce..90dc90147e 100644 --- a/framework/db/oci/Schema.php +++ b/framework/db/oci/Schema.php @@ -52,6 +52,14 @@ class Schema extends \yii\db\Schema // does nothing as Oracle does not support this } + /** + * @inheritdoc + */ + public function quoteSimpleTableName($name) + { + return strpos($name, '"') !== false ? $name : '"' . $name . '"'; + } + /** * @inheritdoc */ @@ -96,11 +104,6 @@ class Schema extends \yii\db\Schema $table->fullName = $table->schemaName !== $this->defaultSchema ? $table->schemaName . '.' . $table->name : $table->name; } - - public function quoteSimpleTableName($name) - { - return strpos($name, '"') !== false ? $name : '"' . $name . '"'; - } /** * Collects the table column metadata.