sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(db): Restaure support for non-nullable boolean column 

We disabled them because they are not supported on Oracle DB and it is
still the case for OCI < 23. But instead of disabling the support
completely for every database types, mark non-nullable boolean column as
actually nullable when using Oracle.

This allow to use some slighly lighter schema on normal databases who
support natively booleans wheen we don't need to store 3 states
true|false|null.

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>
pull/55156/head
Carl Schwan 2025-09-17 14:45:48 +07:00
parent 7a2e25124c
commit 837fe3586d
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/DB/MigrationService.php
Unescape Escape View File

@ -7,6 +7,7 @@
*/ */
namespace OC\DB; namespace OC\DB;
use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Index;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\SchemaException;
@ -576,8 +577,11 @@ class MigrationService {
throw new \InvalidArgumentException('Column "' . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.'); throw new \InvalidArgumentException('Column "' . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');
} }
if ($thing->getNotnull() && $thing->getType()->getName() === Types::BOOLEAN) { if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
throw new \InvalidArgumentException('Column "' . $table->getName() . '"."' . $thing->getName() . '" is type Bool and also NotNull, so it can not store "false".'); // Oracle doesn't support boolean column with non-null value
if ($thing->getNotnull() && $thing->getType()->getName() === Types::BOOLEAN) {
$thing->setNotnull(false);
}
} }
$sourceColumn = null; $sourceColumn = null;

18
tests/lib/DB/MigrationsTest.php
Unescape Escape View File

@ -8,6 +8,7 @@
namespace Test\DB; namespace Test\DB;
use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Schema\Column; use Doctrine\DBAL\Schema\Column;
use Doctrine\DBAL\Schema\ForeignKeyConstraint; use Doctrine\DBAL\Schema\ForeignKeyConstraint;
use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Index;
@ -34,6 +35,7 @@ use OCP\Migration\Attributes\IndexType;
use OCP\Migration\Attributes\ModifyColumn; use OCP\Migration\Attributes\ModifyColumn;
use OCP\Migration\IMigrationStep; use OCP\Migration\IMigrationStep;
use OCP\Server; use OCP\Server;
use PHPUnit\Framework\Attributes\TestWith;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
/** /**
@ -703,8 +705,11 @@ class MigrationsTest extends \Test\TestCase {
} }
public function testEnsureOracleConstraintsBooleanNotNull(): void { #[TestWith([true])]
$this->expectException(\InvalidArgumentException::class); #[TestWith([false])]
public function testEnsureOracleConstraintsBooleanNotNull(bool $isOracle): void {
$this->db->method('getDatabasePlatform')
->willReturn($isOracle ? $this->createMock(OraclePlatform::class) : null);
$column = $this->createMock(Column::class); $column = $this->createMock(Column::class);
$column->expects($this->any()) $column->expects($this->any())
@ -739,6 +744,15 @@ class MigrationsTest extends \Test\TestCase {
->method('hasSequence') ->method('hasSequence')
->willReturn(false); ->willReturn(false);
if ($isOracle) {
$column->expects($this->once())
->method('setNotnull')
->with(false);
} else {
$column->expects($this->never())
->method('setNotnull');
}
self::invokePrivate($this->migrationService, 'ensureOracleConstraints', [$sourceSchema, $schema, 3]); self::invokePrivate($this->migrationService, 'ensureOracleConstraints', [$sourceSchema, $schema, 3]);
} }