Browse Source
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now
Disable Oracle enforcement for now until the following issues are sol…
pull/10589/head
Roeland Jago Douma
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
3 deletions
-
lib/private/DB/MigrationService.php
-
tests/lib/DB/MigrationsTest.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(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -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()) |
|
|
|
|
