Skip to content

Postgresql schema not used by drush #1523 #6577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joejoseph00 wants to merge 2 commits into
base: 14.x
Choose a base branch
from
+20 −4
Open

Postgresql schema not used by drush #1523 #6577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6c71f
Postgresql schema not used by drush #1523
joejoseph00 Jun 16, 2026
dc9e2ff
Merge branch '14.x' into 14.x
joejoseph00 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/Sql/SqlPgsql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

use Drush\Drush;

define('PSQL_SHOW_TABLES', "SELECT tablename FROM pg_tables WHERE schemaname='public';");

class SqlPgsql extends SqlBase
{
public string $queryExtra = "--no-align --field-separator=\"\t\" --pset tuples_only=on";
Expand Down Expand Up @@ -130,14 +128,14 @@ public function dbExists(): bool
public function queryFormat($query)
{
if (strtolower($query) === 'show tables;') {
return PSQL_SHOW_TABLES;
return $this->showTablesSql();
}
return $query;
}

public function listTables(): array
{
$this->alwaysQuery(PSQL_SHOW_TABLES);
$this->alwaysQuery($this->showTablesSql());
$tables = explode(PHP_EOL, trim($this->getProcess()->getOutput()));
return array_filter($tables);
}
Expand Down Expand Up @@ -199,4 +197,22 @@ public function getPasswordFile(): ?string
{
return $this->password_file;
}

private function schemaName(): string
{
$dbSpec = $this->getDbSpec();

return $dbSpec['schema']
?? $dbSpec['database']
?? 'public';
}

private function showTablesSql(): string
{
$schema = str_replace("'", "''", $this->schemaName());

return "SELECT quote_ident(schemaname) || '.' || quote_ident(tablename)
FROM pg_tables
WHERE schemaname='{$schema}';";
}
}