Merge branch 'dbal_3_compat'

atk4 · Aug 15, 2023 · 5d4d431 · 5d4d431
2 parents 8918019 + cdbec7d
commit 5d4d431
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/src/Persistence/Sql/DbalDriverMiddleware.php b/src/Persistence/Sql/DbalDriverMiddleware.php
@@ -17,7 +17,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Query as DbalQuery;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
@@ -28,8 +28,8 @@ class DbalDriverMiddleware extends AbstractDriverMiddleware
 {
     protected function replaceDatabasePlatform(AbstractPlatform $platform): AbstractPlatform
     {
-        if ($platform instanceof SqlitePlatform) {
-            $platform = new class() extends SqlitePlatform {
+        if ($platform instanceof SQLitePlatform) {
+            $platform = new class() extends SQLitePlatform {
                 use Sqlite\PlatformTrait;
             };
         } elseif ($platform instanceof PostgreSQLPlatform) {
@@ -64,7 +64,7 @@ public function createDatabasePlatformForVersion($version): AbstractPlatform
      */
     public function getSchemaManager(DbalConnection $connection, AbstractPlatform $platform): AbstractSchemaManager
     {
-        if ($platform instanceof SqlitePlatform) {
+        if ($platform instanceof SQLitePlatform) {
             return new class($connection, $platform) extends SqliteSchemaManager { // @phpstan-ignore-line
                 use Sqlite\SchemaManagerTrait;
             };

diff --git a/src/Persistence/Sql/Expression.php b/src/Persistence/Sql/Expression.php
@@ -11,7 +11,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Result as DbalResult;
 
@@ -287,9 +287,9 @@ protected function escapeStringLiteral(string $value): string
                     $sqlLeft = 'CAST(' . $sqlLeft . ' AS NVARCHAR(MAX))';
                 }
 
-                return ($platform instanceof SqlitePlatform ? '(' : 'CONCAT(')
+                return ($platform instanceof SQLitePlatform ? '(' : 'CONCAT(')
                     . $sqlLeft
-                    . ($platform instanceof SqlitePlatform ? ' || ' : ', ')
+                    . ($platform instanceof SQLitePlatform ? ' || ' : ', ')
                     . $buildConcatSqlFx($partsRight)
                     . ')';
             }

diff --git a/src/Schema/Migrator.php b/src/Schema/Migrator.php
@@ -20,7 +20,7 @@
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Schema\AbstractAsset;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
@@ -253,7 +253,7 @@ public function field(string $fieldName, array $options = []): self
         }
 
         if (in_array($type, ['string', 'text'], true)) {
-            if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+            if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
                 $column->setPlatformOption('collation', 'NOCASE');
             }
         }

diff --git a/src/Schema/TestCase.php b/src/Schema/TestCase.php
@@ -11,7 +11,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 
 abstract class TestCase extends BaseTestCase
@@ -114,7 +114,7 @@ function ($matches) use ($platform) {
             $sql
         );
 
-        if ($platform instanceof SqlitePlatform && $convertedSql !== $sql) {
+        if ($platform instanceof SQLitePlatform && $convertedSql !== $sql) {
             self::assertSame($sql, $convertedSql);
         }
 

diff --git a/tests/ExpressionSqlTest.php b/tests/ExpressionSqlTest.php
@@ -7,7 +7,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Schema\TestCase;
 use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class ExpressionSqlTest extends TestCase
 {
@@ -33,7 +33,7 @@ public function testBasic(): void
         $i->addField('total_vat', ['type' => 'float']);
         $i->addExpression('total_gross', ['expr' => '[total_net] + [total_vat]', 'type' => 'float']);
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
             self::assertSame(
                 'select `id`, `total_net`, `total_vat`, (`total_net` + `total_vat`) `total_gross` from `invoice`',
                 $i->action('select')->render()[0]
@@ -50,7 +50,7 @@ public function testBasic(): void
 
         $i->addExpression('double_total_gross', ['expr' => '[total_gross] * 2', 'type' => 'float']);
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
             self::assertSame(
                 'select `id`, `total_net`, `total_vat`, (`total_net` + `total_vat`) `total_gross`, ((`total_net` + `total_vat`) * 2) `double_total_gross` from `invoice`',
                 $i->action('select')->render()[0]
@@ -77,7 +77,7 @@ public function testBasicCallback(): void
             return '[total_net] + [total_vat]';
         }, 'type' => 'float']);
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
             self::assertSame(
                 'select `id`, `total_net`, `total_vat`, (`total_net` + `total_vat`) `total_gross` from `invoice`',
                 $i->action('select')->render()[0]
@@ -107,7 +107,7 @@ public function testQuery(): void
         $i->addField('total_vat', ['type' => 'float']);
         $i->addExpression('sum_net', ['expr' => $i->action('fx', ['sum', 'total_net']), ['type' => 'integer']]);
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
             self::assertSame(
                 'select `id`, `total_net`, `total_vat`, (select sum(`total_net`) from `invoice`) `sum_net` from `invoice`',
                 $i->action('select')->render()[0]
@@ -141,7 +141,7 @@ public function testExpressions(): void
         $m->addField('surname');
         $m->addField('cached_name');
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform || $this->getDatabasePlatform() instanceof OraclePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform || $this->getDatabasePlatform() instanceof OraclePlatform) {
             $concatExpr = '[name] || \' \' || [surname]';
         } else {
             $concatExpr = 'CONCAT([name], \' \', [surname])';

diff --git a/tests/ModelAggregateTest.php b/tests/ModelAggregateTest.php
@@ -8,7 +8,7 @@
 use Atk4\Data\Model\Scope;
 use Atk4\Data\Model\Scope\Condition;
 use Atk4\Data\Schema\TestCase;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class ModelAggregateTest extends TestCase
 {
@@ -178,7 +178,7 @@ public function testGroupSelectCondition2(): void
             'double',
             '>',
             // TODO Sqlite bind param does not work, expr needed, even if casted to float with DBAL type (comparison works only if casted to/bind as int)
-            $this->getDatabasePlatform() instanceof SqlitePlatform ? $aggregate->expr('10') : 10
+            $this->getDatabasePlatform() instanceof SQLitePlatform ? $aggregate->expr('10') : 10
         );
 
         self::assertSame([
@@ -201,7 +201,7 @@ public function testGroupSelectCondition3(): void
         $aggregate->addCondition(
             'double',
             // TODO Sqlite bind param does not work, expr needed, even if casted to float with DBAL type (comparison works only if casted to/bind as int)
-            $this->getDatabasePlatform() instanceof SqlitePlatform ? $aggregate->expr('38') : 38
+            $this->getDatabasePlatform() instanceof SQLitePlatform ? $aggregate->expr('38') : 38
         );
 
         self::assertSame([
@@ -239,7 +239,7 @@ public function testGroupSelectScope(): void
         self::fixAllNonAggregatedFieldsInGroupBy($aggregate);
 
         // TODO Sqlite bind param does not work, expr needed, even if casted to float with DBAL type (comparison works only if casted to/bind as int)
-        $numExpr = $this->getDatabasePlatform() instanceof SqlitePlatform ? $aggregate->expr('4') : 4;
+        $numExpr = $this->getDatabasePlatform() instanceof SQLitePlatform ? $aggregate->expr('4') : 4;
         $scope = Scope::createAnd(new Condition('client_id', 2), new Condition('amount', $numExpr));
         $aggregate->addCondition($scope);
 

diff --git a/tests/Persistence/Sql/ConnectionTest.php b/tests/Persistence/Sql/ConnectionTest.php
@@ -8,13 +8,13 @@
 use Atk4\Data\Persistence;
 use Atk4\Data\Persistence\Sql\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class DummyConnection extends Connection
 {
     public function getDatabasePlatform(): AbstractPlatform
     {
-        return new class() extends SqlitePlatform {
+        return new class() extends SQLitePlatform {
             public function getName()
             {
                 return 'dummy';
@@ -27,7 +27,7 @@ class DummyConnection2 extends Connection
 {
     public function getDatabasePlatform(): AbstractPlatform
     {
-        return new class() extends SqlitePlatform {
+        return new class() extends SQLitePlatform {
             public function getName()
             {
                 return 'dummy2';

diff --git a/tests/RandomTest.php b/tests/RandomTest.php
@@ -10,7 +10,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Persistence;
 use Atk4\Data\Schema\TestCase;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class Model_Rate extends Model
 {
@@ -508,7 +508,7 @@ public function testNoWriteActionDelete(): void
 
     public function testTableWithSchema(): void
     {
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform) {
             $userSchema = 'db1';
             $docSchema = 'db2';
             $runWithDb = false;

diff --git a/tests/Schema/TestCaseTest.php b/tests/Schema/TestCaseTest.php
@@ -7,7 +7,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Schema\TestCase;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class TestCaseTest extends TestCase
 {
@@ -37,7 +37,7 @@ public function testLogQuery(): void
             ob_end_clean();
         }
 
-        if (!$this->getDatabasePlatform() instanceof SqlitePlatform && !$this->getDatabasePlatform() instanceof MySQLPlatform) {
+        if (!$this->getDatabasePlatform() instanceof SQLitePlatform && !$this->getDatabasePlatform() instanceof MySQLPlatform) {
             return;
         }
 

diff --git a/tests/ScopeTest.php b/tests/ScopeTest.php
@@ -10,7 +10,7 @@
 use Atk4\Data\Model\Scope\Condition;
 use Atk4\Data\Schema\TestCase;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class SCountry extends Model
 {
@@ -184,7 +184,7 @@ public function testConditionToWords(): void
         $condition = new Condition('country_id', 2);
         self::assertSame('Country ID is equal to 2 (\'Latvia\')', $condition->toWords($user));
 
-        if ($this->getDatabasePlatform() instanceof SqlitePlatform || $this->getDatabasePlatform() instanceof MySQLPlatform) {
+        if ($this->getDatabasePlatform() instanceof SQLitePlatform || $this->getDatabasePlatform() instanceof MySQLPlatform) {
             $condition = new Condition('name', $user->expr('[surname]'));
             self::assertSame('Name is equal to expression \'`surname`\'', $condition->toWords($user));
         }
@@ -319,7 +319,7 @@ public function testConditionOnReferencedRecords(): void
         $user->addCondition('Tickets/user/country_id/Users/#', '>', 1);
         $user->addCondition('Tickets/user/country_id/Users/#', '>=', 2);
         $user->addCondition('Tickets/user/country_id/Users/country_id/Users/#', '>', 1);
-        if (!$this->getDatabasePlatform() instanceof SqlitePlatform) {
+        if (!$this->getDatabasePlatform() instanceof SQLitePlatform) {
             // not supported because of limitation/issue in Sqlite, the generated query fails
             // with error: "parser stack overflow"
             $user->addCondition('Tickets/user/country_id/Users/country_id/Users/name', '!=', null); // should be always true

diff --git a/tests/TypecastingTest.php b/tests/TypecastingTest.php
@@ -8,7 +8,7 @@
 use Atk4\Data\Model;
 use Atk4\Data\Schema\TestCase;
 use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 
 class TypecastingTest extends TestCase
 {
@@ -116,7 +116,7 @@ public function testType(): void
         $m->load(2)->set('float', 8.202343767574732)->save();
         // pdo_sqlite in truncating float, see https://github.com/php/php-src/issues/8510
         // fixed since PHP 8.1, but if converted in SQL to string explicitly, the result is still rounded to 15 significant digits
-        if (!$this->getDatabasePlatform() instanceof SqlitePlatform || \PHP_VERSION_ID >= 80100) {
+        if (!$this->getDatabasePlatform() instanceof SQLitePlatform || \PHP_VERSION_ID >= 80100) {
             self::assertSame(8.202343767574732, $m->load(2)->get('float'));
         }
     }