Merge branch '3.3.x' into 4.0.x

doctrine · Dec 23, 2021 · 3d50257 · 3d50257
2 parents 5b4f4af + f9c3158
commit 3d50257
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 1 deletion.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -4,9 +4,23 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - phpcs.xml.dist
+      - src/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - phpcs.xml.dist
+      - src/**
+      - tests/**
 
 jobs:
   coding-standards:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -5,9 +5,23 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - phpunit.xml.dist
+      - src/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - phpunit.xml.dist
+      - src/**
+      - tests/**
   schedule:
     - cron: "42 3 * * *"
 

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -4,9 +4,27 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - psalm.xml.dist
+      - psalm-strict.xml
+      - src/**
+      - static-analysis/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - psalm.xml.dist
+      - psalm-strict.xml
+      - src/**
+      - static-analysis/**
+      - tests/**
 
 jobs:
   static-analysis-phpstan:

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -602,6 +602,10 @@ The following methods have been removed.
 
 # Upgrade to 3.3
 
+## Deprecated `Type::canRequireSQLConversion()`.
+
+Consumers should call `Type::convertToDatabaseValueSQL()` and `Type::convertToPHPValueSQL()` regardless of the type.
+
 ## Deprecated the `doctrine-dbal` binary.
 
 The documentation explains how the console tools can be bootstrapped for standalone usage.

diff --git a/composer.json b/composer.json
@@ -56,7 +56,11 @@
     },
     "bin": ["bin/doctrine-dbal"],
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "autoload": {
         "psr-4": { "Doctrine\\DBAL\\": "src" }

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -46,6 +46,11 @@
                     See https://github.com/doctrine/dbal/pull/4317
                 -->
                 <file name="tests/Functional/LegacyAPITest.php"/>
+                <!--
+                    TODO: remove in 4.0.0
+                    See https://github.com/doctrine/dbal/pull/5136
+                -->
+                <referencedMethod name="Doctrine\DBAL\Types\Type::canRequireSQLConversion"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

diff --git a/src/Platforms/OraclePlatform.php b/src/Platforms/OraclePlatform.php
@@ -375,6 +375,7 @@ public function getListTableIndexesSQL(string $table, ?string $database = null):
                            SELECT ucon.constraint_type
                            FROM   user_constraints ucon
                            WHERE  ucon.index_name = uind_col.index_name
+                             AND  ucon.table_name = uind_col.table_name
                        ) AS is_primary
              FROM      user_ind_columns uind_col
              WHERE     uind_col.table_name = " . $table . '

diff --git a/src/Types/Type.php b/src/Types/Type.php
@@ -210,6 +210,9 @@ static function (Type $type): string {
      * Usage of {@see convertToDatabaseValueSQL} and
      * {@see convertToPHPValueSQL} works for any type and mostly
      * does nothing. This method can additionally be used for optimization purposes.
+     *
+     * @deprecated Consumers should call {@see convertToDatabaseValueSQL} and {@see convertToPHPValueSQL}
+     * regardless of the type.
      */
     public function canRequireSQLConversion(): bool
     {