Skip to content

Fix excluded tables with schema-qualified names #2071

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
surekap wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix excluded tables with schema-qualified names #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/Propel/Generator/Model/Diff/DatabaseComparator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,19 @@ public function compareTables(bool $caseInsensitive = false): int
*/
protected function isTableExcluded(Table $table): bool
{
$tableName = $table->getName();
if (in_array($tableName, $this->excludedTables, true)) {
return true;
}
$tableNames = [$table->getName(), $table->getCommonName()];

foreach ($this->excludedTables as $excludedTableName) {
if (preg_match('/^' . str_replace('*', '.*', $excludedTableName) . '$/', $tableName)) {
foreach ($tableNames as $tableName) {
if (in_array($tableName, $this->excludedTables, true)) {
return true;
}

foreach ($this->excludedTables as $excludedTableName) {
$pattern = str_replace('\\*', '.*', preg_quote($excludedTableName, '/'));
if (preg_match('/^' . $pattern . '$/', $tableName)) {
return true;
}
}
}

return false;
Expand Down
42 changes: 42 additions & 0 deletions tests/Propel/Tests/Generator/Model/Diff/DatabaseTableComparatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,48 @@ public function testExcludedTablesWithoutRenaming()
$this->assertInstanceOf('Propel\Generator\Model\Diff\DatabaseDiff', $diff);
}

/**
* @return void
*/
public function testExcludedTablesMatchCommonNamesForSchemaQualifiedTables()
{
$d1 = new Database();
$d1->setPlatform($this->platform);
$d1->setSchema('grapevine');
$d1->addTable(new Table('t_audit_log'));

$d2 = new Database();
$d2->setPlatform($this->platform);
$d2->setSchema('grapevine');

$diff = DatabaseComparator::computeDiff($d1, $d2, false, false, true, ['t_audit_log']);
$this->assertFalse($diff);

$diff = DatabaseComparator::computeDiff($d1, $d2, false, false, true, ['t_*']);
$this->assertFalse($diff);

$diff = DatabaseComparator::computeDiff($d1, $d2, false, false, true, ['grapevine.t_*']);
$this->assertFalse($diff);
}

/**
* @return void
*/
public function testExcludedTablePatternsTreatRegexCharactersAsLiterals()
{
$d1 = new Database();
$d1->setPlatform($this->platform);
$d1->setSchema('grapevine');
$d1->addTable(new Table('tXaudit_log'));

$d2 = new Database();
$d2->setPlatform($this->platform);
$d2->setSchema('grapevine');

$diff = DatabaseComparator::computeDiff($d1, $d2, false, false, true, ['t.*']);
$this->assertInstanceOf('Propel\Generator\Model\Diff\DatabaseDiff', $diff);
}

/**
* @return void
*/
Expand Down
Loading