Skip to content

[3.x] Other schema #271

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
wants to merge 5 commits into
base: 3.x-dev
Choose a base branch
from
Open

[3.x] Other schema #271

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db7e531
Using parse_ident
softarius Nov 15, 2024
84f460e
Merge remote-tracking branch 'upstream/3.x-dev' into pgschema
richard67 Mar 23, 2025
c0aea30
Fix PHPCS
richard67 Mar 23, 2025
7d32800
PHPCS Use camel case for method name
richard67 Mar 23, 2025
0f14ab0
More code style suggestions from code review
richard67 Mar 23, 2025
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
65 changes: 48 additions & 17 deletions src/Pgsql/PgsqlDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,32 @@ public function getTableCreate($tables)
return [];
}

/**
* Parses the fully qualified or bare name of the database object (table, view, procedure etc.) into object
* with fields "schema" and "table" respectively
*
* @param string $table Name of the database object with schema or without it
*
* @return object
*/
private function parseIdent($table)
{
$query = $this->getQuery(1);

$query->select(['r[1]','r[2]'])
->from("parse_ident(:t) as r")
->bind(':t', $table);

$qn = $this->setQuery($query)
->loadRow();

if ($qn[1]) {
return (object) ['schema' => $qn[0], 'table' => $qn[1]];
}

return (object) ['schema' => $this->getDefaultSchema(), 'table' => $qn[0]];
}

/**
* Retrieves field information about a given table.
*
Expand All @@ -238,7 +264,7 @@ public function getTableColumns($table, $typeOnly = true)

$result = [];
$tableSub = $this->replacePrefix($table);
$defaultSchema = $this->getDefaultSchema();
$fullname = $this->parseIdent($tableSub);

$this->setQuery(
'
Expand All @@ -259,9 +285,9 @@ public function getTableColumns($table, $typeOnly = true)
LEFT JOIN pg_catalog.pg_attrdef adef ON a.attrelid=adef.adrelid AND a.attnum=adef.adnum
LEFT JOIN pg_catalog.pg_type t ON a.atttypid=t.oid
WHERE a.attrelid =
(SELECT oid FROM pg_catalog.pg_class WHERE relname=' . $this->quote($tableSub) . '
(SELECT oid FROM pg_catalog.pg_class WHERE relname=' . $this->quote($fullname->table) . '
AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE
nspname = ' . $this->quote($defaultSchema) . ')
nspname = ' . $this->quote($fullname->schema) . ')
)
AND a.attnum > 0 AND NOT a.attisdropped
ORDER BY a.attnum'
Expand Down Expand Up @@ -324,8 +350,9 @@ public function getTableKeys($table)
// To check if table exists and prevent SQL injection
$tableList = $this->getTableList();
$tableSub = $this->replacePrefix($table);
$fullname = $this->parseIdent($tableSub);

if (\in_array($tableSub, $tableList, true)) {
if (\in_array($fullname->table, $tableList, true)) {
// Get the details columns information.
$this->setQuery(
'
Expand All @@ -338,7 +365,7 @@ public function getTableKeys($table)
FROM pg_indexes
LEFT JOIN pg_class AS pgClassFirst ON indexname=pgClassFirst.relname
LEFT JOIN pg_index AS pgIndex ON pgClassFirst.oid=pgIndex.indexrelid
WHERE tablename=' . $this->quote($tableSub) . ' ORDER BY indkey'
WHERE tablename=' . $this->quote($fullname->table) . ' ORDER BY indkey'
);

return $this->loadObjectList();
Expand All @@ -362,7 +389,8 @@ public function getNamesKey($table, $indKey)
{
$this->connect();

$tableSub = $this->replacePrefix($table);
$tableSub = $this->replacePrefix($table);
$fullname = $this->parseIdent($tableSub);

$tabInd = explode(' ', $indKey);
$colNames = [];
Expand All @@ -371,7 +399,7 @@ public function getNamesKey($table, $indKey)
$query = $this->createQuery()
->select('attname')
->from('pg_attribute')
->join('LEFT', 'pg_class ON pg_class.relname=' . $this->quote($tableSub))
->join('LEFT', 'pg_class ON pg_class.relname=' . $this->quote($fullname->table))
->where('attnum=' . $numCol . ' AND attrelid=pg_class.oid');
$this->setQuery($query);
$colNames[] = $this->loadResult();
Expand Down Expand Up @@ -417,8 +445,9 @@ public function getTableSequences($table)
// To check if table exists and prevent SQL injection
$tableList = $this->getTableList();
$tableSub = $this->replacePrefix($table);
$fullname = $this->parseIdent($tableSub);

if (\in_array($tableSub, $tableList, true)) {
if (\in_array($fullname->table, $tableList, true)) {
$name = [
's.relname', 'n.nspname', 't.relname', 'a.attname', 'info.data_type',
'info.minimum_value', 'info.maximum_value', 'info.increment', 'info.cycle_option', 'info.start_value',
Expand All @@ -437,7 +466,7 @@ public function getTableSequences($table)
->leftJoin('pg_namespace n ON n.oid = t.relnamespace')
->leftJoin('pg_attribute a ON a.attrelid = t.oid AND a.attnum = d.refobjsubid')
->leftJoin('information_schema.sequences AS info ON info.sequence_name = s.relname')
->where('s.relkind = ' . $this->quote('S') . ' AND d.deptype = ' . $this->quote('a') . ' AND t.relname = ' . $this->quote($tableSub));
->where('s.relkind = ' . $this->quote('S') . ' AND d.deptype = ' . $this->quote('a') . ' AND t.relname = ' . $this->quote($fullname->table));
$this->setQuery($query);

return $this->loadObjectList();
Expand Down Expand Up @@ -527,14 +556,16 @@ public function renameTable($oldTable, $newTable, $backup = null, $prefix = null
{
$this->connect();

$oldTable = $this->replacePrefix($oldTable);
$newTable = $this->replacePrefix($newTable);
$oldTable = $this->replacePrefix($oldTable);
$newTable = $this->replacePrefix($newTable);
$fullOldTable = $this->parseIdent($oldTable);
$fullNewTable = $this->parseIdent($newTable);

// To check if table exists and prevent SQL injection
$tableList = $this->getTableList();

// Origin Table does not exist
if (!\in_array($oldTable, $tableList, true)) {
if (!\in_array($fullOldTable->table, $tableList, true)) {
// Origin Table not found
throw new \RuntimeException('Table not found in Postgresql database.');
}
Expand All @@ -543,7 +574,7 @@ public function renameTable($oldTable, $newTable, $backup = null, $prefix = null
$subQuery = $this->createQuery()
->select('indexrelid')
->from('pg_index, pg_class')
->where('pg_class.relname = ' . $this->quote($oldTable))
->where('pg_class.relname = ' . $this->quote($fullOldTable->table))
->where('pg_class.oid = pg_index.indrelid');

$this->setQuery(
Expand All @@ -556,7 +587,7 @@ public function renameTable($oldTable, $newTable, $backup = null, $prefix = null
$oldIndexes = $this->loadColumn();

foreach ($oldIndexes as $oldIndex) {
$changedIdxName = str_replace($oldTable, $newTable, $oldIndex);
$changedIdxName = str_replace($fullOldTable->table, $fullNewTable->table, $oldIndex);
$this->setQuery('ALTER INDEX ' . $this->escape($oldIndex) . ' RENAME TO ' . $this->escape($changedIdxName))->execute();
}

Expand All @@ -573,18 +604,18 @@ public function renameTable($oldTable, $newTable, $backup = null, $prefix = null
->from('pg_class')
->where('relkind = ' . $this->quote('S'))
->where('relnamespace IN (' . (string) $subQuery . ')')
->where('relname LIKE ' . $this->quote("%$oldTable%"))
->where('relname LIKE ' . $this->quote("%{$fullOldTable->table}%"))
);

$oldSequences = $this->loadColumn();

foreach ($oldSequences as $oldSequence) {
$changedSequenceName = str_replace($oldTable, $newTable, $oldSequence);
$changedSequenceName = str_replace($fullOldTable->table, $fullNewTable->table, $oldSequence);
$this->setQuery('ALTER SEQUENCE ' . $this->escape($oldSequence) . ' RENAME TO ' . $this->escape($changedSequenceName))->execute();
}

// Rename table
$this->setQuery('ALTER TABLE ' . $this->escape($oldTable) . ' RENAME TO ' . $this->escape($newTable))->execute();
$this->setQuery('ALTER TABLE ' . $this->escape($fullOldTable->table) . ' RENAME TO ' . $this->escape($fullNewTable->table))->execute();

return $this;
}
Expand Down