diff options
| -rw-r--r-- | core/Migrations/Version18000Date20190920085628.php | 4 | ||||
| -rw-r--r-- | lib/private/DB/MigrationService.php | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php index 96fcfc7ab81..0e83855d55b 100644 --- a/core/Migrations/Version18000Date20190920085628.php +++ b/core/Migrations/Version18000Date20190920085628.php @@ -60,7 +60,9 @@ class Version18000Date20190920085628 extends SimpleMigrationStep { $table->addColumn('displayname', Types::STRING, [ 'notnull' => true, 'length' => 255, - 'default' => '', + // Will be overwritten in postSchemaChange, but Oracle can not save + // empty strings in notnull columns + 'default' => 'name', ]); } diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 42204dd155a..cd0280162d3 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -513,6 +513,11 @@ class MigrationService { if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && \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 name "' . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.'); + } } foreach ($table->getIndexes() as $thing) { |