Merge pull request #22643 from nextcloud/bugfix/noid/fix-installing-o…

…n-oracle Fix installing on Oracle
nextcloud · Sep 7, 2020 · 34d2ae2 · 34d2ae2
2 parents 0e6344f + 5023084
commit 34d2ae2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php
@@ -60,7 +60,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$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
@@ -513,6 +513,11 @@ public function ensureOracleIdentifierLengthLimit(Schema $sourceSchema, Schema $
 				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) {