Merge pull request #22643 from nextcloud/bugfix/noid/fix-installing-on-oracle

MorrisJobke · web-flow · commit 34d2ae25f789 · 2020-09-07T20:55:50.000+02:00
Fix installing on Oracle
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) {

Original file line number	Diff line number	Diff line change
`@@ -513,6 +513,11 @@ public function ensureOracleIdentifierLengthLimit(Schema $sourceSchema, Schema $`
`513`	`513`	`if ((!$sourceTable instanceof Table \|\| !$sourceTable->hasColumn($thing->getName())) && \strlen($thing->getName()) > 30) {`
`514`	`514`	`throw new \InvalidArgumentException('Column name "' . $table->getName() . '"."' . $thing->getName() . '" is too long.');`
`515`	`515`	`}`
	`516`	`+`
	`517`	`+ if ($thing->getNotnull() && $thing->getDefault() === ''`
	`518`	`+ && $sourceTable instanceof Table && !$sourceTable->hasColumn($thing->getName())) {`
	`519`	`+ throw new \InvalidArgumentException('Column name "' . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');`
	`520`	`+ }`
`516`	`521`	`}`
`517`	`522`
`518`	`523`	`foreach ($table->getIndexes() as $thing) {`