diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-08-08 14:10:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 14:10:18 +0200 |
commit | 6b1ba9cdaf3ce5d63e6e46bcbc677cf7933f5fb3 (patch) | |
tree | 79312ad90210ff33904be06eea949d98ebe70874 | |
parent | e7e30ac25f05706ba7898bcb295d85bbcd0ec3c2 (diff) | |
parent | fe286e21caebe3fd2552f2bf403f75c43e709e57 (diff) | |
download | nextcloud-server-6b1ba9cdaf3ce5d63e6e46bcbc677cf7933f5fb3.tar.gz nextcloud-server-6b1ba9cdaf3ce5d63e6e46bcbc677cf7933f5fb3.zip |
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now
Disable Oracle enforcement for now until the following issues are sol…
-rw-r--r-- | lib/private/DB/MigrationService.php | 3 | ||||
-rw-r--r-- | tests/lib/DB/MigrationsTest.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 412bb61a086..f584cb351d2 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(); } diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index dd06b9096cc..7e201191087 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()) |