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

Fixes #1435: pgsql getTableNames() should not prefix table names with schema name.

Browse Source
This commit is contained in:
Qiang Xue
2013-12-05 12:31:45 -05:00
parent 2fca1e9061
commit 64ef54bf18
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,8 +156,7 @@ class Schema extends \yii\db\Schema
/** /**
* Returns all table names in the database. * Returns all table names in the database.
* @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema. * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
* If not empty, the returned table names will be prefixed with the schema name. * @return array all table names in the database. The names have NO schema name prefix.
* @return array all table names in the database.
*/ */
protected function findTableNames($schema = '') protected function findTableNames($schema = '')
{ {
@ -173,11 +172,7 @@ EOD;
$rows = $command->queryAll(); $rows = $command->queryAll();
$names = []; $names = [];
foreach ($rows as $row) { foreach ($rows as $row) {
if ($schema === $this->defaultSchema) { $names[] = $row['table_name'];
$names[] = $row['table_name'];
} else {
$names[] = $row['table_schema'] . '.' . $row['table_name'];
}
} }
return $names; return $names;
} }