Skip to content

refactor(database): optimize _processForeignKeys() string allocations and loop invariants #10351

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
gr8man wants to merge 2 commits into
base: develop
Choose a base branch
from
+30 −23
Open

refactor(database): optimize _processForeignKeys() string allocations and loop invariants #10351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86c9f3
perf: optimize _processForeignKeys()
gr8man Jun 29, 2026
d007add
refactor: apply code review fixes for _processForeignKeys optimization
gr8man Jun 30, 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
53 changes: 30 additions & 23 deletions system/Database/Forge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,10 @@ protected function _processIndexes(string $table, bool $asQuery = false): array
*/
protected function _processForeignKeys(string $table, bool $asQuery = false): array
{
if ($this->foreignKeys === []) {
return [''];
}

$errorNames = [];

foreach ($this->foreignKeys as $fkeyInfo) {
Expand All @@ -1225,40 +1229,43 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar
throw new DatabaseException(lang('Database.fieldNotExists', $errorNames));
}

$sqls = [''];

foreach ($this->foreignKeys as $index => $fkey) {
if ($asQuery === false) {
$index = 0;
} else {
$sqls[$index] = '';
}
$sqls = [''];
$isOci8 = $this->db->DBDriver === 'OCI8';
$dbPrefix = $this->db->DBPrefix;
$fkSuffix = $isOci8 ? '_fk' : '_foreign';

$nameIndex = $fkey['fkName'] !== '' ?
$fkey['fkName'] :
$table . '_' . implode('_', $fkey['field']) . ($this->db->DBDriver === 'OCI8' ? '_fk' : '_foreign');
$prefixSql = $asQuery
? 'ALTER TABLE ' . $this->db->escapeIdentifiers($dbPrefix . $table) . ' ADD '
: ",\n\t";

$nameIndexFilled = $this->db->escapeIdentifiers($nameIndex);
$foreignKeyFilled = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
$referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
$referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
foreach ($this->foreignKeys as $index => $fkey) {
$idx = $asQuery ? $index : 0;

if ($asQuery) {
$sqls[$index] .= 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $table) . ' ADD ';
} else {
$sqls[$index] .= ",\n\t";
$sqls[$idx] = '';
}

$formatSql = 'CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)';
$sqls[$index] .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
$nameIndex = $fkey['fkName'] !== ''
? $fkey['fkName']
: $table . '_' . implode('_', $fkey['field']) . $fkSuffix;

$sql = $prefixSql . sprintf(
'CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)',
$this->db->escapeIdentifiers($nameIndex),
implode(', ', $this->db->escapeIdentifiers($fkey['field'])),
$this->db->escapeIdentifiers($dbPrefix . $fkey['referenceTable']),
implode(', ', $this->db->escapeIdentifiers($fkey['referenceField'])),
);

if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $this->fkAllowActions, true)) {
$sqls[$index] .= ' ON DELETE ' . $fkey['onDelete'];
$sql .= ' ON DELETE ' . $fkey['onDelete'];
}

if ($this->db->DBDriver !== 'OCI8' && $fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $this->fkAllowActions, true)) {
$sqls[$index] .= ' ON UPDATE ' . $fkey['onUpdate'];
if (! $isOci8 && $fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $this->fkAllowActions, true)) {
$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
}

$sqls[$idx] .= $sql;
}

return $sqls;
Expand Down
Loading