Merge 4.3.x up into 5.0.x

UPGRADE.md

@@ -168,6 +168,11 @@ all drivers and middleware.
 
 # Upgrade to 4.3
 
+## Deprecated `AbstractSchemaManager::_getPortableTableDefinition()`
+
+The `AbstractSchemaManager::_getPortableTableDefinition()` method has been deprecated. Use the schema name and the
+unqualified table name separately instead.
+
 ## Deprecated `PostgreSQLSchemaManager` methods related to the current schema
 
 The following `PostgreSQLSchemaManager` methods have been deprecated:

docs/en/reference/types.rst

@@ -478,7 +478,6 @@ The following table shows an overview of Doctrine's type abstraction.
 The matrix contains the mapping information for how a specific Doctrine
 type is mapped to the database and back to PHP.
 Please also notice the mapping specific footnotes for additional information.
-::
 
     +-------------------+--------------------+-----------------------------------------------------------------------------------------------+
     | Doctrine          | PHP                | Database vendor                                                                               |
@@ -602,10 +601,10 @@ Please also notice the mapping specific footnotes for additional information.
     |                   |                    +--------------------------+         |                                                          |
     |                   |                    | **PostgreSQL**           | *all*   | ``UUID``                                                 |
     +-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+
-    | **binary**        | ``resource``       | **MySQL**                | *all*   | ``VARBINARY(n)`` [3]                                     |
+    | **binary**        | ``string``         | **MySQL**                | *all*   | ``VARBINARY(n)`` [3]                                     |
     | [2]  [6]          |                    +--------------------------+         |                                                          |
-    |                   |                    | **SQL Server**           |         +----------------------------------------------------------+
-    |                   |                    +--------------------------+         | ``BINARY(n)`` [4]                                        |
+    |                   |                    | **SQL Server**           |         | ``BINARY(n)`` [4]                                        |
+    |                   |                    +--------------------------+---------+----------------------------------------------------------+
     |                   |                    | **Oracle**               | *all*   | ``RAW(n)``                                               |
     |                   |                    +--------------------------+---------+----------------------------------------------------------+
     |                   |                    | **PostgreSQL**           | *all*   | ``BYTEA`` [15]                                           |

src/Driver/IBMDB2/Result.php

@@ -11,6 +11,7 @@
 
 use function db2_fetch_array;
 use function db2_fetch_assoc;
+use function db2_field_name;
 use function db2_free_result;
 use function db2_num_fields;
 use function db2_num_rows;

src/Platforms/SQLServerPlatform.php

@@ -1191,11 +1191,17 @@ protected function getLikeWildcardCharacters(): string
 
     protected function getCommentOnTableSQL(string $tableName, string $comment): string
     {
+        if (str_contains($tableName, '.')) {
+            [$schemaName, $tableName] = explode('.', $tableName);
+        } else {
+            $schemaName = 'dbo';
+        }
+
         return $this->getAddExtendedPropertySQL(
             'MS_Description',
             $comment,
             'SCHEMA',
-            $this->quoteStringLiteral('dbo'),
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($schemaName)),
             'TABLE',
             $this->quoteStringLiteral($this->unquoteSingleIdentifier($tableName)),
         );

src/Schema/AbstractSchemaManager.php

@@ -837,7 +837,11 @@ protected function _getPortableTableIndexesList(array $rows): array
         return $indexes;
     }
 
-    /** @param array<string, string> $table */
+    /**
+     * @deprecated Use the schema name and the unqualified table name separately instead.
+     *
+     * @param array<string, string> $table
+     */
     abstract protected function _getPortableTableDefinition(array $table): string;
 
     /** @param array<string, mixed> $view */

src/Schema/DB2SchemaManager.php

@@ -12,6 +12,7 @@
 use function array_change_key_case;
 use function implode;
 use function preg_match;
+use function sprintf;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -23,6 +24,8 @@
 /**
  * IBM Db2 Schema Manager.
  *
+ * @link https://www.ibm.com/docs/en/db2/11.5?topic=sql-catalog-views
+ *
  * @extends AbstractSchemaManager<DB2Platform>
  */
 class DB2SchemaManager extends AbstractSchemaManager
@@ -101,6 +104,8 @@
     }
 
     /**
+     * @deprecated Use the schema name and the unqualified table name separately instead.
+     *
      * {@inheritDoc}
      */
     protected function _getPortableTableDefinition(array $table): string
@@ -178,24 +183,29 @@
     protected function selectTableNames(string $databaseName): Result
     {
         $sql = <<<'SQL'
-SELECT NAME
-FROM SYSIBM.SYSTABLES
+SELECT TABNAME AS NAME
+FROM SYSCAT.TABLES
 WHERE TYPE = 'T'
-  AND CREATOR = ?
+  AND TABSCHEMA = ?
 SQL;
 
         return $this->connection->executeQuery($sql, [$databaseName]);
     }
 
     protected function selectTableColumns(string $databaseName, ?string $tableName = null): Result
     {
-        $sql = 'SELECT';
+        $conditions = ['C.TABSCHEMA = ?'];
+        $params     = [$databaseName];
 
-        if ($tableName === null) {
-            $sql .= ' C.TABNAME AS NAME,';
+        if ($tableName !== null) {
+            $conditions[] = 'C.TABNAME = ?';
+            $params[]     = $tableName;
         }
 
-        $sql .= <<<'SQL'
+        $sql = sprintf(
+            <<<'SQL'
+SELECT
+       C.TABNAME AS NAME,
        C.COLNAME,
        C.TYPENAME,
        C.CODEPAGE,
@@ -212,30 +222,30 @@
          JOIN SYSCAT.TABLES AS T
               ON T.TABSCHEMA = C.TABSCHEMA
                   AND T.TABNAME = C.TABNAME
-SQL;
-
-        $conditions = ['C.TABSCHEMA = ?', "T.TYPE = 'T'"];
-        $params     = [$databaseName];
-
-        if ($tableName !== null) {
-            $conditions[] = 'C.TABNAME = ?';
-            $params[]     = $tableName;
-        }
-
-        $sql .= ' WHERE ' . implode(' AND ', $conditions) . ' ORDER BY C.TABNAME, C.COLNO';
+ WHERE %s
+   AND T.TYPE = 'T'
+ORDER BY C.TABNAME, C.COLNO
+SQL,
+            implode(' AND ', $conditions),
+        );
 
         return $this->connection->executeQuery($sql, $params);
     }
 
     protected function selectIndexColumns(string $databaseName, ?string $tableName = null): Result
     {
-        $sql = 'SELECT';
+        $conditions = ['IDX.TABSCHEMA = ?'];
+        $params     = [$databaseName];
 
-        if ($tableName === null) {
-            $sql .= ' IDX.TABNAME AS NAME,';
+        if ($tableName !== null) {
+            $conditions[] = 'IDX.TABNAME = ?';
+            $params[]     = $tableName;
         }
 
-        $sql .= <<<'SQL'
+        $sql = sprintf(
+            <<<'SQL'
+      SELECT
+             IDX.TABNAME AS NAME,
              IDX.INDNAME AS KEY_NAME,
              IDXCOL.COLNAME AS COLUMN_NAME,
              CASE
@@ -251,30 +261,32 @@
           ON IDX.TABSCHEMA = T.TABSCHEMA AND IDX.TABNAME = T.TABNAME
         JOIN SYSCAT.INDEXCOLUSE AS IDXCOL
           ON IDX.INDSCHEMA = IDXCOL.INDSCHEMA AND IDX.INDNAME = IDXCOL.INDNAME
-SQL;
-
-        $conditions = ['IDX.TABSCHEMA = ?', "T.TYPE = 'T'"];
-        $params     = [$databaseName];
-
-        if ($tableName !== null) {
-            $conditions[] = 'IDX.TABNAME = ?';
-            $params[]     = $tableName;
-        }
-
-        $sql .= ' WHERE ' . implode(' AND ', $conditions) . ' ORDER BY IDX.INDNAME, IDXCOL.COLSEQ';
+       WHERE %s
+         AND T.TYPE = 'T'
+    ORDER BY IDX.TABNAME,
+             IDX.INDNAME,
+             IDXCOL.COLSEQ
+SQL,
+            implode(' AND ', $conditions),
+        );
 
         return $this->connection->executeQuery($sql, $params);
     }
 
     protected function selectForeignKeyColumns(string $databaseName, ?string $tableName = null): Result
     {
-        $sql = 'SELECT';
+        $conditions = ['R.TABSCHEMA = ?'];
+        $params     = [$databaseName];
 
-        if ($tableName === null) {
-            $sql .= ' R.TABNAME AS NAME,';
+        if ($tableName !== null) {
+            $conditions[] = 'R.TABNAME = ?';
+            $params[]     = $tableName;
         }
 
-        $sql .= <<<'SQL'
+        $sql = sprintf(
+            <<<'SQL'
+      SELECT
+             R.TABNAME AS NAME,
              FKCOL.COLNAME AS LOCAL_COLUMN,
              R.REFTABNAME AS FOREIGN_TABLE,
              PKCOL.COLNAME AS FOREIGN_COLUMN,
@@ -300,17 +312,14 @@
                   AND PKCOL.TABSCHEMA = R.REFTABSCHEMA
                   AND PKCOL.TABNAME = R.REFTABNAME
                   AND PKCOL.COLSEQ = FKCOL.COLSEQ
-SQL;
-
-        $conditions = ['R.TABSCHEMA = ?', "T.TYPE = 'T'"];
-        $params     = [$databaseName];
-
-        if ($tableName !== null) {
-            $conditions[] = 'R.TABNAME = ?';
-            $params[]     = $tableName;
-        }
-
-        $sql .= ' WHERE ' . implode(' AND ', $conditions) . ' ORDER BY R.CONSTNAME, FKCOL.COLSEQ';
+      WHERE %s
+        AND T.TYPE = 'T'
+   ORDER BY R.TABNAME,
+            R.CONSTNAME,
+            FKCOL.COLSEQ
+SQL,
+            implode(' AND ', $conditions),
+        );
 
         return $this->connection->executeQuery($sql, $params);
     }
@@ -320,31 +329,29 @@
      */
     protected function fetchTableOptionsByTable(string $databaseName, ?string $tableName = null): array
     {
-        $sql = 'SELECT NAME, REMARKS';
-
-        $conditions = [];
-        $params     = [];
+        $conditions = ['TABSCHEMA = ?'];
+        $params     = [$databaseName];
 
         if ($tableName !== null) {
-            $conditions[] = 'NAME = ?';
+            $conditions[] = 'TABNAME = ?';
             $params[]     = $tableName;
         }
 
-        $sql .= ' FROM SYSIBM.SYSTABLES';
-
-        if ($conditions !== []) {
-            $sql .= ' WHERE ' . implode(' AND ', $conditions);
-        }
-
-        /** @var array<string,array<string,mixed>> $metadata */
-        $metadata = $this->connection->executeQuery($sql, $params)
-            ->fetchAllAssociativeIndexed();
+        $sql = sprintf(
+            <<<'SQL'
+      SELECT TABNAME,
+             REMARKS
+        FROM SYSCAT.TABLES
+      WHERE %s
+        AND TYPE = 'T'
+   ORDER BY TABNAME
+SQL,
+            implode(' AND ', $conditions),
+        );
 
         $tableOptions = [];
-        foreach ($metadata as $table => $data) {
-            $data = array_change_key_case($data, CASE_LOWER);
-
-            $tableOptions[$table] = ['comment' => $data['remarks']];
+        foreach ($this->connection->iterateKeyValue($sql, $params) as $table => $remarks) {
+            $tableOptions[$table] = ['comment' => $remarks];
         }
 
         return $tableOptions;