Merge pull request #6419 from doctrine/4.0.x

Merge 4.0.x up into 4.1.x
doctrine · Jun 2, 2024 · eb80c04 · eb80c04
2 parents f293a9b + cbd0e9a
commit eb80c04
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Driver/OCI8/Middleware/InitializeSession.php b/src/Driver/OCI8/Middleware/InitializeSession.php
@@ -28,7 +28,6 @@ public function connect(
                     'ALTER SESSION SET'
                         . " NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"
                         . " NLS_TIME_FORMAT = 'HH24:MI:SS'"
-                        . " NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"
                         . " NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"
                         . " NLS_TIMESTAMP_TZ_FORMAT = 'YYYY-MM-DD HH24:MI:SS TZH:TZM'"
                         . " NLS_NUMERIC_CHARACTERS = '.,'",

diff --git a/src/Schema/Comparator.php b/src/Schema/Comparator.php
@@ -371,6 +371,10 @@ private function detectRenamedIndexes(array &$addedIndexes, array &$removedIndex
 
     protected function diffForeignKey(ForeignKeyConstraint $key1, ForeignKeyConstraint $key2): bool
     {
+        if (strtolower($key1->getName()) !== strtolower($key2->getName())) {
+            return true;
+        }
+
         if (
             array_map('strtolower', $key1->getUnquotedLocalColumns())
             !== array_map('strtolower', $key2->getUnquotedLocalColumns())

diff --git a/tests/Schema/AbstractComparatorTestCase.php b/tests/Schema/AbstractComparatorTestCase.php
@@ -345,7 +345,7 @@ public function testCompareColumnCompareCaseInsensitive(): void
         self::assertTrue($tableDiff->isEmpty());
     }
 
-    public function testCompareIndexBasedOnPropertiesNotName(): void
+    public function testDetectIndexNameChange(): void
     {
         $tableA = new Table('foo');
         $tableA->addColumn('id', Types::INTEGER);
@@ -363,7 +363,7 @@ public function testCompareIndexBasedOnPropertiesNotName(): void
         );
     }
 
-    public function testCompareForeignKeyBasedOnPropertiesNotName(): void
+    public function testDetectForeignKeyNameChange(): void
     {
         $tableA = new Table('foo');
         $tableA->addColumn('id', Types::INTEGER);
@@ -373,9 +373,14 @@ public function testCompareForeignKeyBasedOnPropertiesNotName(): void
         $tableB->addColumn('ID', Types::INTEGER);
         $tableB->addForeignKeyConstraint('bar', ['id'], ['id'], [], 'bar_constraint');
 
-        $tableDiff = $this->comparator->compareTables($tableA, $tableB);
-
-        self::assertTrue($tableDiff->isEmpty());
+        self::assertEquals(
+            new TableDiff($tableA, [], [], [], [], [], [], [], [], [
+                new ForeignKeyConstraint(['id'], 'bar', ['id'], 'bar_constraint'),
+            ], [], [
+                new ForeignKeyConstraint(['id'], 'bar', ['id'], 'foo_constraint'),
+            ]),
+            $this->comparator->compareTables($tableA, $tableB),
+        );
     }
 
     public function testDetectRenameColumn(): void