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

Merge pull request #10618 from githubjeka/ar-refac

Browse Source 
nya
This commit is contained in:
Alexander Makarov
2016-01-19 15:27:49 +03:00
parent 608c1f1055 2c3e9a4296
commit 1aee6ddf2a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
framework/db/ActiveRecord.php
View File

@@ -291,12 +291,15 @@ class ActiveRecord extends BaseActiveRecord
*/ */
public static function getTableSchema() public static function getTableSchema()
{ {
$schema = static::getDb()->getSchema()->getTableSchema(static::tableName()); $schema = static::getDb()
if ($schema !== null) { ->getSchema()
return $schema; ->getTableSchema(static::tableName());
} else {
if ($schema === null) {
throw new InvalidConfigException('The table does not exist: ' . static::tableName()); throw new InvalidConfigException('The table does not exist: ' . static::tableName());
} }
return $schema;
} }
/** /**

4
framework/db/Schema.php
View File

@@ -104,7 +104,7 @@ abstract class Schema extends Object
/** /**
* Loads the metadata for the specified table. * Loads the metadata for the specified table.
* @param string $name table name * @param string $name table name
* @return TableSchema DBMS-dependent table metadata, null if the table does not exist. * @return null|TableSchema DBMS-dependent table metadata, null if the table does not exist.
*/ */
abstract protected function loadTableSchema($name); abstract protected function loadTableSchema($name);
@@ -112,7 +112,7 @@ abstract class Schema extends Object
* Obtains the metadata for the named table. * Obtains the metadata for the named table.
* @param string $name table name. The table name may contain schema name if any. Do not quote the table name. * @param string $name table name. The table name may contain schema name if any. Do not quote the table name.
* @param boolean $refresh whether to reload the table schema even if it is found in the cache. * @param boolean $refresh whether to reload the table schema even if it is found in the cache.
* @return TableSchema table metadata. Null if the named table does not exist. * @return null|TableSchema table metadata. Null if the named table does not exist.
*/ */
public function getTableSchema($name, $refresh = false) public function getTableSchema($name, $refresh = false)
{ {