Merge branch '4.5.x' into 5.0.x

Author: morozov

UPGRADE.md

@@ -419,10 +419,15 @@ all drivers and middleware.
 
 # Upgrade to 4.5
 
+## Deprecated not specifying either of the `host` and `connectstring` parameters for `oci8` and `pdo_oci` connections.
+
+Not specifying either of the `host` and `connectstring` parameters for `oci8` and `pdo_oci` connections has been
+deprecated. One of them must be specified.
+
 ## Deprecated `dbname` connection parameter for `oci8` and `pdo_oci` connections.
 
-Using the `dbname` connection parameter for `oci8` and `pdo_oci` connections has been deprecated. Use `servicename` or
-`sid` instead.
+Using the `dbname` connection parameter for `oci8` and `pdo_oci` connections has been deprecated. Use `servicename`,
+`sid` or `connectstring` instead.
 
 # Upgrade to 4.4
 

docs/en/reference/configuration.rst

@@ -300,7 +300,8 @@ pdo_oci / oci8
    database.
 -  ``password`` (string): Password to use when connecting to the
    database.
--  ``host`` (string): Hostname of the database to connect to.
+-  ``host`` (string): Hostname of the database to connect to. The hostname needs to be specified unless
+   ``connectstring`` is specified.
 -  ``port`` (integer): Port of the database to connect to.
 -  ``dbname`` (string): Name of the database/schema to connect to. Using this parameter is deprecated.
 -  ``servicename`` (string): Optional name by which clients can
@@ -317,8 +318,7 @@ pdo_oci / oci8
 -  ``connectstring`` (string): Complete Easy Connect connection descriptor,
    see `docs.oracle.com/en/database/oracle/oracle-database/23/netag/configuring-naming-methods.html <https://docs.oracle.com/en/database/oracle/oracle-database/23/netag/configuring-naming-methods.html>`_. When using this option,
    you will still need to provide the ``user`` and ``password`` parameters, but the other
-   parameters will no longer be used. Note that when using this parameter, the ``getHost``
-   and ``getPort`` methods from ``Doctrine\DBAL\Connection`` will no longer function as expected.
+   parameters will no longer be used.
 -  ``persistent`` (boolean): Whether to establish a persistent connection.
 -  ``driverOptions`` (array):
     -  ``exclusive`` (boolean): Once specified for an ``oci8`` connection, forces the driver to always establish

src/Connection.php

@@ -931,8 +931,11 @@ public function transactional(Closure $func): mixed
             $res = $func($this);
 
             $successful = true;
+        } catch (ConnectionLost $connectionLost) {
+            // Catching here only to be able to prevent a rollback attempt
+            throw $connectionLost;
         } finally {
-            if (! $successful) {
+            if (! isset($connectionLost) && ! $successful) {
                 $this->rollBack();
             }
         }
@@ -948,6 +951,7 @@ public function transactional(Closure $func): mixed
                 || $t instanceof UniqueConstraintViolationException
                 || $t instanceof ForeignKeyConstraintViolationException
                 || $t instanceof DeadlockException
+                || $t instanceof ConnectionLost
             );
 
             throw $t;

src/Driver/AbstractOracleDriver/EasyConnectString.php

@@ -48,6 +48,12 @@ public static function fromConnectionParameters(array $params): self
         }
 
         if (! isset($params['host'])) {
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/7244',
+                'Not specifying either of the "host" and "connectstring" parameters is deprecated.',
+            );
+
             return new self($params['dbname'] ?? '');
         }
 
@@ -59,7 +65,8 @@ public static function fromConnectionParameters(array $params): self
             Deprecation::trigger(
                 'doctrine/dbal',
                 'https://github.com/doctrine/dbal/pull/7239',
-                'Using the "dbname" parameter is deprecated. Use "servicename" or "sid" instead.',
+                'Using the "dbname" parameter is deprecated. Use "servicename", "sid" or "connectstring"'
+                    . ' instead.',
             );
         }
 

src/Schema/Column.php

@@ -35,6 +35,7 @@
  *     charset?: ?non-empty-string,
  *     collation?: ?non-empty-string,
  *     default_constraint_name?: non-empty-string,
+ *     enumType?: class-string,
  * }
  */
 class Column extends AbstractNamedObject
@@ -262,6 +263,16 @@ public function getMaximumValue(): mixed
         return $this->_platformOptions['max'] ?? null;
     }
 
+    /**
+     * Returns the enum type used by the column.
+     *
+     * @return ?class-string
+     */
+    public function getEnumType(): ?string
+    {
+        return $this->_platformOptions['enumType'] ?? null;
+    }
+
     /**
      * @internal Should be used only from within the {@see AbstractSchemaManager} class hierarchy.
      *
@@ -366,6 +377,7 @@ public function edit(): ColumnEditor
             ->setCollation($this->getCollation())
             ->setMinimumValue($this->getMinimumValue())
             ->setMaximumValue($this->getMaximumValue())
+            ->setEnumType($this->getEnumType())
             ->setDefaultConstraintName($this->getDefaultConstraintName());
     }
 }

src/Schema/ColumnEditor.php

@@ -34,6 +34,9 @@ final class ColumnEditor
 
     private mixed $maximumValue = null;
 
+    /** @var ?class-string  */
+    private ?string $enumType = null;
+
     private bool $autoincrement = false;
 
     private string $comment = '';
@@ -159,6 +162,14 @@ public function setMaximumValue(mixed $maximumValue): self
         return $this;
     }
 
+    /** @param ?class-string $enumType */
+    public function setEnumType(?string $enumType): self
+    {
+        $this->enumType = $enumType;
+
+        return $this;
+    }
+
     public function setAutoincrement(bool $flag): self
     {
         $this->autoincrement = $flag;
@@ -245,6 +256,10 @@ public function create(): Column
             $platformOptions['max'] = $this->maximumValue;
         }
 
+        if ($this->enumType !== null) {
+            $platformOptions['enumType'] = $this->enumType;
+        }
+
         if ($this->defaultConstraintName !== null) {
             $platformOptions[SQLServerPlatform::OPTION_DEFAULT_CONSTRAINT_NAME] = $this->defaultConstraintName;
         }

tests/Driver/AbstractOracleDriver/EasyConnectStringTest.php

@@ -26,7 +26,6 @@ public function testFromConnectionParameters(array $params, string $expected): v
     public static function connectionParametersProvider(): iterable
     {
         return [
-            'empty-params' => [[],''],
             'common-params' => [
                 [
                     'host' => 'oracle.example.com',
@@ -118,4 +117,13 @@ public static function getConnectionParameters(): iterable
             false,
         ];
     }
+
+    public function testNoHostOrConnectStringSpecified(): void
+    {
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/7244');
+
+        $string = EasyConnectString::fromConnectionParameters([]);
+
+        self::assertSame('', (string) $string);
+    }
 }

tests/Functional/TransactionTest.php

@@ -48,6 +48,27 @@ public function testRollbackFailure(): void
         });
     }
 
+    public function testTransactionalFailureDuringCallback(): void
+    {
+        $this->connection->transactional(
+            function (): void {
+                $this->expectConnectionLoss(static function (Connection $connection): void {
+                    $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
+                });
+            },
+        );
+    }
+
+    public function testTransactionalFailureDuringCommit(): void
+    {
+        $this->connection->transactional(
+            function (): void {
+                $this->expectConnectionLoss(static function (Connection $connection): void {
+                });
+            },
+        );
+    }
+
     private function expectConnectionLoss(callable $scenario): void
     {
         $this->killCurrentSession();

tests/Schema/ColumnTest.php

@@ -35,6 +35,7 @@ public function testGet(): void
         self::assertEquals('baz', $column->getDefault());
 
         self::assertEquals('utf8', $column->getCharset());
+        self::assertEquals(self::class, $column->getEnumType());
         self::assertNull($column->getCollation());
     }
 
@@ -55,6 +56,7 @@ public function testToArray(): void
             'comment' => '',
             'values' => [],
             'charset' => 'utf8',
+            'enumType' => self::class,
         ];
 
         self::assertEquals($expected, $this->createColumn()->toArray());
@@ -93,6 +95,7 @@ public function createColumn(): Column
             ->setFixed(true)
             ->setDefaultValue('baz')
             ->setCharset('utf8')
+            ->setEnumType(self::class)
             ->create();
     }