Merge pull request #6378 from greg0ire/4.0.x

Merge 3.8.x up into 4.0.x

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"
+    target-branch: "3.8.x"

.github/workflows/coding-standards.yml

@@ -25,4 +25,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.0"

.github/workflows/continuous-integration.yml

@@ -68,7 +68,7 @@ jobs:
           ini-values: "zend.assertions=1"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
           dependency-versions: "${{ matrix.dependencies }}"
@@ -136,7 +136,7 @@ jobs:
           ini-values: "zend.assertions=1"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -193,7 +193,7 @@ jobs:
           ini-values: "zend.assertions=1"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -257,7 +257,7 @@ jobs:
           ini-values: "zend.assertions=1"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -328,7 +328,7 @@ jobs:
           extensions: "${{ matrix.extension }}"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -399,7 +399,7 @@ jobs:
           extensions: "${{ matrix.extension }}"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -470,7 +470,7 @@ jobs:
           extensions: "${{ matrix.extension }}-5.10.0beta1"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -541,7 +541,7 @@ jobs:
           IBM_DB2_CONFIGURE_OPTS: "--with-IBM_DB2=/tmp/clidriver"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--ignore-platform-req=php+"
 
@@ -576,7 +576,7 @@ jobs:
         run: "composer config minimum-stability dev"
 
       - name: "Install development dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--prefer-dist"
 
@@ -612,6 +612,9 @@ jobs:
         working-directory: reports
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v3"
+        uses: "codecov/codecov-action@v4"
         with:
           directory: reports
+          fail_ci_if_error: true
+        env:
+          CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/lock-closed-issues.yml

@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v5
         with:
           github-token: '${{ github.token }}'
           issue-inactive-days: 30

.github/workflows/static-analysis.yml

@@ -48,7 +48,7 @@ jobs:
           tools: "cs2pr"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
 
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan --error-format=checkstyle | cs2pr"
@@ -74,7 +74,7 @@ jobs:
           tools: cs2pr
 
       - name: Install dependencies with Composer
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
 
       - name: Run static analysis with Vimeo Psalm
         run: vendor/bin/psalm --shepherd

src/Platforms/SQLServerPlatform.php

@@ -34,8 +34,11 @@
 use function preg_match_all;
 use function sprintf;
 use function str_contains;
+use function str_ends_with;
 use function str_replace;
+use function str_starts_with;
 use function strtoupper;
+use function substr;
 use function substr_count;
 
 use const PREG_OFFSET_CAPTURE;
@@ -256,6 +259,13 @@ public function getCreatePrimaryKeySQL(Index $index, string $table): string
         return $sql . ' (' . implode(', ', $index->getQuotedColumns($this)) . ')';
     }
 
+    private function unquoteSingleIdentifier(string $possiblyQuotedName): string
+    {
+        return str_starts_with($possiblyQuotedName, '[') && str_ends_with($possiblyQuotedName, ']')
+            ? substr($possiblyQuotedName, 1, -1)
+            : $possiblyQuotedName;
+    }
+
     /**
      * Returns the SQL statement for creating a column comment.
      *
@@ -274,23 +284,20 @@ public function getCreatePrimaryKeySQL(Index $index, string $table): string
     protected function getCreateColumnCommentSQL(string $tableName, string $columnName, string $comment): string
     {
         if (str_contains($tableName, '.')) {
-            [$schemaSQL, $tableSQL] = explode('.', $tableName);
-            $schemaSQL              = $this->quoteStringLiteral($schemaSQL);
-            $tableSQL               = $this->quoteStringLiteral($tableSQL);
+            [$schemaName, $tableName] = explode('.', $tableName);
         } else {
-            $schemaSQL = "'dbo'";
-            $tableSQL  = $this->quoteStringLiteral($tableName);
+            $schemaName = 'dbo';
         }
 
         return $this->getAddExtendedPropertySQL(
             'MS_Description',
             $comment,
             'SCHEMA',
-            $schemaSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($schemaName)),
             'TABLE',
-            $tableSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($tableName)),
             'COLUMN',
-            $columnName,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($columnName)),
         );
     }
 
@@ -568,23 +575,20 @@ private function alterColumnRequiresDropDefaultConstraint(ColumnDiff $columnDiff
     protected function getAlterColumnCommentSQL(string $tableName, string $columnName, string $comment): string
     {
         if (str_contains($tableName, '.')) {
-            [$schemaSQL, $tableSQL] = explode('.', $tableName);
-            $schemaSQL              = $this->quoteStringLiteral($schemaSQL);
-            $tableSQL               = $this->quoteStringLiteral($tableSQL);
+            [$schemaName, $tableName] = explode('.', $tableName);
         } else {
-            $schemaSQL = "'dbo'";
-            $tableSQL  = $this->quoteStringLiteral($tableName);
+            $schemaName = 'dbo';
         }
 
         return $this->getUpdateExtendedPropertySQL(
             'MS_Description',
             $comment,
             'SCHEMA',
-            $schemaSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($schemaName)),
             'TABLE',
-            $tableSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($tableName)),
             'COLUMN',
-            $columnName,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($columnName)),
         );
     }
 
@@ -605,22 +609,19 @@ protected function getAlterColumnCommentSQL(string $tableName, string $columnNam
     protected function getDropColumnCommentSQL(string $tableName, string $columnName): string
     {
         if (str_contains($tableName, '.')) {
-            [$schemaSQL, $tableSQL] = explode('.', $tableName);
-            $schemaSQL              = $this->quoteStringLiteral($schemaSQL);
-            $tableSQL               = $this->quoteStringLiteral($tableSQL);
+            [$schemaName, $tableName] = explode('.', $tableName);
         } else {
-            $schemaSQL = "'dbo'";
-            $tableSQL  = $this->quoteStringLiteral($tableName);
+            $schemaName = 'dbo';
         }
 
         return $this->getDropExtendedPropertySQL(
             'MS_Description',
             'SCHEMA',
-            $schemaSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($schemaName)),
             'TABLE',
-            $tableSQL,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($tableName)),
             'COLUMN',
-            $columnName,
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($columnName)),
         );
     }
 
@@ -663,10 +664,13 @@ protected function getAddExtendedPropertySQL(
         ?string $level2Name = null,
     ): string {
         return 'EXEC sp_addextendedproperty ' .
-            'N' . $this->quoteStringLiteral($name) . ', N' . $this->quoteStringLiteral((string) $value) . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level0Type) . ', ' . $level0Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level1Type) . ', ' . $level1Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level2Type) . ', ' . $level2Name;
+            'N' . $this->quoteStringLiteral($name) . ', N' . $this->quoteStringLiteral($value ?? '') . ', ' .
+            'N' . $this->quoteStringLiteral($level0Type ?? '') . ', ' . $level0Name . ', ' .
+            'N' . $this->quoteStringLiteral($level1Type ?? '') . ', ' . $level1Name .
+            ($level2Type !== null || $level2Name !== null
+                ? ', N' . $this->quoteStringLiteral($level2Type ?? '') . ', ' . $level2Name
+                : ''
+            );
     }
 
     /**
@@ -693,9 +697,12 @@ protected function getDropExtendedPropertySQL(
     ): string {
         return 'EXEC sp_dropextendedproperty ' .
             'N' . $this->quoteStringLiteral($name) . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level0Type) . ', ' . $level0Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level1Type) . ', ' . $level1Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level2Type) . ', ' . $level2Name;
+            'N' . $this->quoteStringLiteral($level0Type ?? '') . ', ' . $level0Name . ', ' .
+            'N' . $this->quoteStringLiteral($level1Type ?? '') . ', ' . $level1Name .
+            ($level2Type !== null || $level2Name !== null
+                ? ', N' . $this->quoteStringLiteral($level2Type ?? '') . ', ' . $level2Name
+                : ''
+            );
     }
 
     /**
@@ -723,10 +730,13 @@ protected function getUpdateExtendedPropertySQL(
         ?string $level2Name = null,
     ): string {
         return 'EXEC sp_updateextendedproperty ' .
-            'N' . $this->quoteStringLiteral($name) . ', N' . $this->quoteStringLiteral((string) $value) . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level0Type) . ', ' . $level0Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level1Type) . ', ' . $level1Name . ', ' .
-            'N' . $this->quoteStringLiteral((string) $level2Type) . ', ' . $level2Name;
+            'N' . $this->quoteStringLiteral($name) . ', N' . $this->quoteStringLiteral($value ?? '') . ', ' .
+            'N' . $this->quoteStringLiteral($level0Type ?? '') . ', ' . $level0Name . ', ' .
+            'N' . $this->quoteStringLiteral($level1Type ?? '') . ', ' . $level1Name .
+            ($level2Type !== null || $level2Name !== null
+                ? ', N' . $this->quoteStringLiteral($level2Type ?? '') . ', ' . $level2Name
+                : ''
+            );
     }
 
     public function getEmptyIdentityInsertSQL(string $quotedTableName, string $quotedIdentifierColumnName): string
@@ -1168,15 +1178,13 @@ protected function getLikeWildcardCharacters(): string
 
     protected function getCommentOnTableSQL(string $tableName, string $comment): string
     {
-        return sprintf(
-            <<<'SQL'
-                EXEC sys.sp_addextendedproperty @name=N'MS_Description',
-                  @value=N%s, @level0type=N'SCHEMA', @level0name=N'dbo',
-                  @level1type=N'TABLE', @level1name=N%s
-                SQL
-            ,
-            $this->quoteStringLiteral($comment),
-            $this->quoteStringLiteral($tableName),
+        return $this->getAddExtendedPropertySQL(
+            'MS_Description',
+            $comment,
+            'SCHEMA',
+            $this->quoteStringLiteral('dbo'),
+            'TABLE',
+            $this->quoteStringLiteral($this->unquoteSingleIdentifier($tableName)),
         );
     }
 

src/Platforms/SQLitePlatform.php

@@ -36,6 +36,7 @@
 use function str_replace;
 use function strpos;
 use function strtolower;
+use function substr;
 use function trim;
 
 /**
@@ -674,7 +675,13 @@ public function getAlterTableSQL(TableDiff $diff): array
             $columns[strtolower($column->getName())] = $column;
         }
 
-        $dataTable = new Table('__temp__' . $table->getName());
+        $tableName = $table->getName();
+        $pos       = strpos($tableName, '.');
+        if ($pos !== false) {
+            $tableName = substr($tableName, $pos + 1);
+        }
+
+        $dataTable = new Table('__temp__' . $tableName);
 
         $newTable = new Table(
             $table->getQuotedName($this),

src/Schema/SQLiteSchemaManager.php

@@ -79,7 +79,7 @@ public function listTableForeignKeys(string $table): array
     {
         $table = $this->normalizeName($table);
 
-        $columns = $this->selectForeignKeyColumns('', $table)
+        $columns = $this->selectForeignKeyColumns('main', $table)
             ->fetchAllAssociative();
 
         if (count($columns) > 0) {

tests/Functional/Schema/SQLiteSchemaManagerTest.php

@@ -7,12 +7,15 @@
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
+use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\BlobType;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 
+use function array_keys;
 use function array_shift;
 
 class SQLiteSchemaManagerTest extends SchemaManagerFunctionalTestCase
@@ -207,6 +210,24 @@ public function testNonSimpleAlterTableCreatedFromDDL(): void
         self::assertSame(['name'], $index->getColumns());
     }
 
+    public function testAlterTableWithSchema(): void
+    {
+        $this->dropTableIfExists('t');
+
+        $table = new Table('main.t');
+        $table->addColumn('a', Types::INTEGER);
+        $this->schemaManager->createTable($table);
+
+        self::assertSame(['a'], array_keys($this->schemaManager->listTableColumns('t')));
+
+        $tableDiff = new TableDiff($table, [], [], [], [
+            'a' => new Column('b', Type::getType(Types::INTEGER)),
+        ], [], [], [], [], [], [], []);
+        $this->schemaManager->alterTable($tableDiff);
+
+        self::assertSame(['b'], array_keys($this->schemaManager->listTableColumns('t')));
+    }
+
     public function testIntrospectMultipleAnonymousForeignKeyConstraints(): void
     {
         $this->dropTableIfExists('album');