Merge pull request #6659 from morozov/remove-shortest-name

Remove AbstractAsset::getShortestName()

Author: morozov

UPGRADE.md

@@ -8,6 +8,10 @@ awareness about deprecated code.
 
 # Upgrade to 5.0
 
+## BC BREAK: Removed `AbstractAsset::getShortestName()`
+
+The `AbstractAsset::getShortestName()` method has been removed.
+
 ## BC BREAK: Removed `Sequence::isAutoIncrementsFor()`
 
 The `Sequence::isAutoIncrementsFor()` method has been removed.

psalm.xml.dist

@@ -62,12 +62,6 @@
                 -->
                 <referencedMethod name="Doctrine\DBAL\Schema\AbstractAsset::getNameParser" />
                 <referencedMethod name="Doctrine\DBAL\Schema\AbstractAsset::setName" />
-
-                <!--
-                    https://github.com/doctrine/dbal/pull/6657
-                    TODO: remove in 5.0.0
-                -->
-                <referencedMethod name="Doctrine\DBAL\Schema\AbstractAsset::getShortestName" />
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

src/Schema/AbstractAsset.php

@@ -12,7 +12,6 @@
 use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
 use Doctrine\DBAL\Schema\Name\Parser;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_map;
 use function assert;
@@ -21,7 +20,6 @@
 use function dechex;
 use function implode;
 use function str_replace;
-use function strtolower;
 use function strtoupper;
 use function substr;
 
@@ -158,29 +156,6 @@ public function getNamespaceName(): ?string
         return $this->_namespace;
     }
 
-    /**
-     * The shortest name is stripped of the default namespace. All other
-     * namespaced elements are returned as full-qualified names.
-     *
-     * @deprecated Use {@link getName()} instead.
-     */
-    public function getShortestName(?string $defaultNamespaceName): string
-    {
-        Deprecation::triggerIfCalledFromOutside(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/6657',
-            '%s is deprecated and will be removed in 5.0.',
-            __METHOD__,
-        );
-
-        $shortestName = $this->getName();
-        if ($this->_namespace === $defaultNamespaceName) {
-            $shortestName = $this->_name;
-        }
-
-        return strtolower($shortestName);
-    }
-
     /**
      * Checks if this asset's name is quoted.
      */

src/Schema/Comparator.php

@@ -54,13 +54,13 @@ public function compareSchemas(Schema $oldSchema, Schema $newSchema): SchemaDiff
         }
 
         foreach ($newSchema->getTables() as $newTable) {
-            $newTableName = $newTable->getShortestName($newSchema->getName());
+            $newTableName = $newTable->getName();
             if (! $oldSchema->hasTable($newTableName)) {
-                $createdTables[] = $newSchema->getTable($newTableName);
+                $createdTables[] = $newTable;
             } else {
                 $tableDiff = $this->compareTables(
                     $oldSchema->getTable($newTableName),
-                    $newSchema->getTable($newTableName),
+                    $newTable,
                 );
 
                 if (! $tableDiff->isEmpty()) {
@@ -71,7 +71,7 @@ public function compareSchemas(Schema $oldSchema, Schema $newSchema): SchemaDiff
 
         // Check if there are tables removed
         foreach ($oldSchema->getTables() as $oldTable) {
-            $oldTableName = $oldTable->getShortestName($oldSchema->getName());
+            $oldTableName = $oldTable->getName();
 
             $oldTable = $oldSchema->getTable($oldTableName);
             if ($newSchema->hasTable($oldTableName)) {
@@ -82,18 +82,18 @@ public function compareSchemas(Schema $oldSchema, Schema $newSchema): SchemaDiff
         }
 
         foreach ($newSchema->getSequences() as $newSequence) {
-            $newSequenceName = $newSequence->getShortestName($newSchema->getName());
+            $newSequenceName = $newSequence->getName();
             if (! $oldSchema->hasSequence($newSequenceName)) {
                 $createdSequences[] = $newSequence;
             } else {
                 if ($this->diffSequence($newSequence, $oldSchema->getSequence($newSequenceName))) {
-                    $alteredSequences[] = $newSchema->getSequence($newSequenceName);
+                    $alteredSequences[] = $newSequence;
                 }
             }
         }
 
         foreach ($oldSchema->getSequences() as $oldSequence) {
-            $oldSequenceName = $oldSequence->getShortestName($oldSchema->getName());
+            $oldSequenceName = $oldSequence->getName();
 
             if ($newSchema->hasSequence($oldSequenceName)) {
                 continue;

src/Schema/PostgreSQLSchemaManager.php

@@ -135,7 +135,13 @@ protected function _getPortableTableForeignKeyDefinition(array $tableForeignKey)
      */
     protected function _getPortableViewDefinition(array $view): View
     {
-        return new View($view['schemaname'] . '.' . $view['viewname'], $view['definition']);
+        if ($view['schemaname'] === $this->getCurrentSchema()) {
+            $name = $view['viewname'];
+        } else {
+            $name = $view['schemaname'] . '.' . $view['viewname'];
+        }
+
+        return new View($name, $view['definition']);
     }
 
     /**
@@ -202,7 +208,7 @@ protected function _getPortableDatabaseDefinition(array $database): string
      */
     protected function _getPortableSequenceDefinition(array $sequence): Sequence
     {
-        if ($sequence['schemaname'] !== 'public') {
+        if ($sequence['schemaname'] !== $this->getCurrentSchema()) {
             $sequenceName = $sequence['schemaname'] . '.' . $sequence['relname'];
         } else {
             $sequenceName = $sequence['relname'];

tests/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -128,7 +128,7 @@ private function filterElementsByName(array $items, string $name): array
         return array_filter(
             $items,
             static function (AbstractAsset $item) use ($name): bool {
-                return $item->getShortestName($item->getNamespaceName()) === $name;
+                return strtolower($item->getName()) === $name;
             },
         );
     }

tests/Schema/AbstractComparatorTestCase.php

@@ -600,23 +600,6 @@ public function testNamespacesComparison(): void
         self::assertCount(2, $diff->getCreatedTables());
     }
 
-    public function testFqnSchemaComparisonDifferentSchemaNameButSameTableNoDiff(): void
-    {
-        $config = new SchemaConfig();
-        $config->setName('foo');
-
-        $oldSchema = new Schema([], [], $config);
-        $oldSchema->createTable('foo.bar');
-
-        $newSchema = new Schema();
-        $newSchema->createTable('bar');
-
-        self::assertEquals(
-            new SchemaDiff([], [], [], [], [], [], [], []),
-            $this->comparator->compareSchemas($oldSchema, $newSchema),
-        );
-    }
-
     public function testFqnSchemaComparisonNoSchemaSame(): void
     {
         $config = new SchemaConfig();