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

Fixed several formatting issues.

Browse Source 
Refactored == null to is_null == '' to empty(...)
This commit is contained in:
Gevik Babakhani
2013-06-06 16:29:17 +02:00
parent cceb5b1122
commit 5a587d16f0
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/yii/db/pgsql/PDO.php
View File

@@ -16,13 +16,14 @@ namespace yii\db\pgsql;
* @author Gevik babakhani <gevikb@gmail.com> * @author Gevik babakhani <gevikb@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class PDO extends \PDO { class PDO extends \PDO
{
const OPT_SEARCH_PATH = 'search_path'; const OPT_SEARCH_PATH = 'search_path';
const OPT_DEFAULT_SCHEMA = 'default_schema'; const OPT_DEFAULT_SCHEMA = 'default_schema';
const DEFAULT_SCHEMA = 'public'; const DEFAULT_SCHEMA = 'public';
private $_currentDatabase = null; private $_currentDatabase;
/** /**
* Returns value of the last inserted ID. * Returns value of the last inserted ID.
@@ -53,11 +54,11 @@ class PDO extends \PDO {
} }
if (isset($options[self::OPT_DEFAULT_SCHEMA])) { if (isset($options[self::OPT_DEFAULT_SCHEMA])) {
$schema = trim($options[self::OPT_DEFAULT_SCHEMA]); $schema = trim($options[self::OPT_DEFAULT_SCHEMA]);
if ($schema !== '') { if (!empty($schema)) {
Schema::$DEFAULT_SCHEMA = $schema; Schema::$DEFAULT_SCHEMA = $schema;
} }
} }
if (Schema::$DEFAULT_SCHEMA === null || Schema::$DEFAULT_SCHEMA === '') { if (is_null(Schema::$DEFAULT_SCHEMA) || empty(Schema::$DEFAULT_SCHEMA)) {
Schema::$DEFAULT_SCHEMA = self::DEFAULT_SCHEMA; Schema::$DEFAULT_SCHEMA = self::DEFAULT_SCHEMA;
} }
} }

3
framework/yii/db/pgsql/QueryBuilder.php
View File

@@ -14,7 +14,8 @@ namespace yii\db\pgsql;
* @author Gevik Babakhani <gevikb@gmail.com> * @author Gevik Babakhani <gevikb@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class QueryBuilder extends \yii\db\QueryBuilder { class QueryBuilder extends \yii\db\QueryBuilder
{
/** /**
* @var array mapping from abstract column types (keys) to physical column types (values). * @var array mapping from abstract column types (keys) to physical column types (values).

3
framework/yii/db/pgsql/Schema.php
View File

@@ -18,7 +18,8 @@ use yii\db\ColumnSchema;
* @author Gevik Babakhani <gevikb@gmail.com> * @author Gevik Babakhani <gevikb@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Schema extends \yii\db\Schema { class Schema extends \yii\db\Schema
{
/** /**
* The default schema used for the current session. This value is * The default schema used for the current session. This value is