From f5c63d7a6e86fa17e35c552b0807b9014d0dd2e5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 6 Aug 2018 17:34:40 +0200 Subject: [PATCH 1/2] Disable Oracle enforcement for now until the following issues are solved: * Only apps should be checked which say they support oracle * Only check newly added items, to allow forward migration from an existing database structure Signed-off-by: Joas Schilling --- lib/private/DB/MigrationService.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 412bb61a08..f584cb351d 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -457,7 +457,8 @@ class MigrationService { if ($toSchema instanceof SchemaWrapper) { $targetSchema = $toSchema->getWrappedSchema(); - $this->ensureOracleIdentifierLengthLimit($targetSchema, strlen($this->connection->getPrefix())); + // TODO re-enable once stable14 is branched of: https://github.com/nextcloud/server/issues/10518 + // $this->ensureOracleIdentifierLengthLimit($targetSchema, strlen($this->connection->getPrefix())); $this->connection->migrateToSchema($targetSchema); $toSchema->performDropTableCalls(); } From fe286e21caebe3fd2552f2bf403f75c43e709e57 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 8 Aug 2018 12:58:50 +0200 Subject: [PATCH 2/2] Fix tests Signed-off-by: Roeland Jago Douma --- tests/lib/DB/MigrationsTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index dd06b9096c..7e20119108 100644 --- a/tests/lib/DB/MigrationsTest.php +++ b/tests/lib/DB/MigrationsTest.php @@ -102,12 +102,13 @@ class MigrationsTest extends \Test\TestCase { ->method('migrateToSchema'); $wrappedSchema = $this->createMock(Schema::class); - $wrappedSchema->expects($this->once()) + // TODO re-enable once stable14 is branched of: https://github.com/nextcloud/server/issues/10518 + /*$wrappedSchema->expects($this->once()) ->method('getTables') ->willReturn([]); $wrappedSchema->expects($this->once()) ->method('getSequences') - ->willReturn([]); + ->willReturn([]);*/ $schemaResult = $this->createMock(SchemaWrapper::class); $schemaResult->expects($this->once())