mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now 

Disable Oracle enforcement for now until the following issues are sol…
This commit is contained in:
Roeland Jago Douma 2018-08-08 14:10:18 +02:00 committed by GitHub
parent e7e30ac25f fe286e21ca
commit 6b1ba9cdaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/DB/MigrationService.php
View File

@ -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();
}

5
tests/lib/DB/MigrationsTest.php
View File

@ -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())