Commit 64ef54bf by Qiang Xue

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

parent 2fca1e90
...@@ -156,8 +156,7 @@ class Schema extends \yii\db\Schema ...@@ -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; ...@@ -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;
} }
......
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