diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-04-19 13:05:34 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-04-19 13:05:34 +0200 |
| commit | 2ab8268128f13520874c15ef5e3bf1e4dc386cb0 (patch) | |
| tree | 2953dde62e7eb92147dd7eda5b764cd5123033ce /lib/private/DB | |
| parent | 2866f4f7d24c35bffbdfa750aef1742e3bcfa587 (diff) | |
| download | nextcloud-server-2ab8268128f13520874c15ef5e3bf1e4dc386cb0.tar.gz nextcloud-server-2ab8268128f13520874c15ef5e3bf1e4dc386cb0.zip | |
Do not check Oracle column constraints in unrelated migrations
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/DB')
| -rw-r--r-- | lib/private/DB/MigrationService.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index ee64b45be64..44b6bfa2888 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -587,12 +587,12 @@ class MigrationService { throw new \InvalidArgumentException('Column name "' . $table->getName() . '"."' . $thing->getName() . '" is too long.'); } - if ($thing->getNotnull() && $thing->getDefault() === '' + if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && $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) { + if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && $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".'); } } |