Skip to content

Ensure schema change before checking OracleConstraints #31872

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

Merged
blizzz merged 4 commits into from
Apr 7, 2022
Merged

Ensure schema change before checking OracleConstraints #31872

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e20d5fa
Ensure schema change before checking OracleConstraints
skjnldsv Apr 7, 2022
1e5a879
Fix createNamedParameter in LDAP migrations
skjnldsv Apr 7, 2022
0257315
Improve error logging on migration failure
skjnldsv Apr 7, 2022
82c33be
Fix typos and empty tabs
nickvergessen Apr 7, 2022
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
Prev Previous commit
Fix typos and empty tabs 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 7, 2022
commit 82c33be744b1e9d85c780bce277c783c6d38e7bf
8 changes: 4 additions & 4 deletions lib/private/DB/MigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,17 +582,17 @@ public function ensureOracleConstraints(Schema $sourceSchema, Schema $targetSche
}

foreach ($table->getColumns() as $thing) {
// If the table doesn't exists OR if the column doesn't exists in the table
// If the table doesn't exist OR if the column doesn't exist in the table
if (!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) {
if (\strlen($thing->getName()) > 30) {
throw new \InvalidArgumentException('Column name "' . $table->getName() . '"."' . $thing->getName() . '" is too long.');
}

if ($thing->getNotnull() && $thing->getDefault() === ''
&& $sourceTable instanceof Table && !$sourceTable->hasColumn($thing->getName())) {
throw new \InvalidArgumentException('Column "' . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');
}

if ($thing->getNotnull() && $thing->getType()->getName() === Types::BOOLEAN) {
throw new \InvalidArgumentException('Column "' . $table->getName() . '"."' . $thing->getName() . '" is type Bool and also NotNull, so it can not store "false".');
}
Expand All @@ -601,7 +601,7 @@ public function ensureOracleConstraints(Schema $sourceSchema, Schema $targetSche
} else {
$sourceColumn = $sourceTable->getColumn($thing->getName());
}

// If the column was just created OR the length changed OR the type changed
// we will NOT detect invalid length if the column is not modified
if (($sourceColumn === null || $sourceColumn->getLength() !== $thing->getLength() || $sourceColumn->getType()->getName() !== Types::STRING)
Expand Down