Merge branch 'bpo/2.10/#3790' into 2.10

doctrine · Jan 13, 2020 · e5d1edc · e5d1edc
2 parents d49d68f + a525610
commit e5d1edc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php b/lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php
@@ -233,7 +233,7 @@ public function getUnqualifiedForeignTableName()
         $position = strrpos($name, '.');
 
         if ($position !== false) {
-            $name = substr($name, $position);
+            $name = substr($name, $position + 1);
         }
 
         return strtolower($name);

diff --git a/tests/Doctrine/Tests/DBAL/Schema/ForeignKeyConstraintTest.php b/tests/Doctrine/Tests/DBAL/Schema/ForeignKeyConstraintTest.php
@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Table;
 use PHPUnit\Framework\TestCase;
 
 class ForeignKeyConstraintTest extends TestCase
@@ -56,4 +57,30 @@ public static function getIntersectsIndexColumnsData() : iterable
             [['FOO'], true],
         ];
     }
+
+    /**
+     * @param string|Table $foreignTableName
+     *
+     * @group DBAL-1062
+     * @dataProvider getUnqualifiedForeignTableNameData
+     */
+    public function testGetUnqualifiedForeignTableName($foreignTableName, string $expectedUnqualifiedTableName) : void
+    {
+        $foreignKey = new ForeignKeyConstraint(['foo', 'bar'], $foreignTableName, ['fk_foo', 'fk_bar']);
+
+        self::assertSame($expectedUnqualifiedTableName, $foreignKey->getUnqualifiedForeignTableName());
+    }
+
+    /**
+     * @return mixed[][]
+     */
+    public static function getUnqualifiedForeignTableNameData() : iterable
+    {
+        return [
+            ['schema.foreign_table', 'foreign_table'],
+            ['foreign_table', 'foreign_table'],
+            [new Table('schema.foreign_table'), 'foreign_table'],
+            [new Table('foreign_table'), 'foreign_table'],
+        ];
+    }
 }