Merge pull request #6416 from doctrine/3.8.x

Merge 3.8.x up into 3.9.x
doctrine · Jun 1, 2024 · f375b44 · f375b44
2 parents 7d67d25 + 080aab5
commit f375b44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Driver/OCI8/Middleware/InitializeSession.php b/src/Driver/OCI8/Middleware/InitializeSession.php
@@ -26,7 +26,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
@@ -555,6 +555,10 @@ private function detectRenamedIndexes(array &$addedIndexes, array &$removedIndex
      */
     public function diffForeignKey(ForeignKeyConstraint $key1, ForeignKeyConstraint $key2)
     {
+        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
@@ -652,7 +652,7 @@ public function testCompareColumnCompareCaseInsensitive(): void
         self::assertFalse($tableDiff);
     }
 
-    public function testCompareIndexBasedOnPropertiesNotName(): void
+    public function testDetectIndexNameChange(): void
     {
         $tableA = new Table('foo');
         $tableA->addColumn('id', Types::INTEGER);
@@ -672,7 +672,7 @@ public function testCompareIndexBasedOnPropertiesNotName(): void
         );
     }
 
-    public function testCompareForeignKeyBasedOnPropertiesNotName(): void
+    public function testDetectForeignKeyNameChange(): void
     {
         $tableA = new Table('foo');
         $tableA->addColumn('id', Types::INTEGER);
@@ -683,8 +683,9 @@ public function testCompareForeignKeyBasedOnPropertiesNotName(): void
         $tableB->addForeignKeyConstraint('bar', ['id'], ['id'], [], 'bar_constraint');
 
         $tableDiff = $this->comparator->diffTable($tableA, $tableB);
-
-        self::assertFalse($tableDiff);
+        self::assertNotFalse($tableDiff);
+        self::assertCount(1, $tableDiff->addedForeignKeys);
+        self::assertCount(1, $tableDiff->removedForeignKeys);
     }
 
     public function testCompareForeignKeyRestrictNoActionAreTheSame(): void