Instantiate View via the editor

Author: morozov

src/Platforms/PostgreSQLPlatform.php

@@ -162,9 +162,9 @@ public function getListSequencesSQL(string $database): string
     /** @internal The method should be only used from within the {@see AbstractSchemaManager} class hierarchy. */
     public function getListViewsSQL(string $database): string
     {
-        return 'SELECT quote_ident(table_name) AS viewname,
-                       table_schema AS schemaname,
-                       view_definition AS definition
+        return 'SELECT table_name,
+                       table_schema,
+                       view_definition
                 FROM   information_schema.views
                 WHERE  view_definition IS NOT NULL';
     }

src/Schema/AbstractSchemaManager.php

@@ -861,7 +861,7 @@ public function createView(View $view): void
         $this->connection->executeStatement(
             $this->platform->getCreateViewSQL(
                 $view->getObjectName()->toSQL($this->platform),
-                $view->getSql(),
+                $view->getSQL(),
             ),
         );
     }

src/Schema/DB2SchemaManager.php

@@ -171,7 +171,10 @@ protected function _getPortableViewDefinition(array $view): View
             $sql = substr($view['text'], $pos + 4);
         }
 
-        return new View($view['name'], $sql);
+        return View::editor()
+            ->setQuotedName($view['name'])
+            ->setSQL($sql)
+            ->create();
     }
 
     protected function selectTableNames(string $databaseName): Result

src/Schema/MySQLSchemaManager.php

@@ -62,7 +62,10 @@ class MySQLSchemaManager extends AbstractSchemaManager
      */
     protected function _getPortableViewDefinition(array $view): View
     {
-        return new View($view['TABLE_NAME'], $view['VIEW_DEFINITION']);
+        return View::editor()
+            ->setQuotedName($view['TABLE_NAME'])
+            ->setSQL($view['VIEW_DEFINITION'])
+            ->create();
     }
 
     /**

src/Schema/OracleSchemaManager.php

@@ -42,7 +42,10 @@ protected function _getPortableViewDefinition(array $view): View
     {
         $view = array_change_key_case($view, CASE_LOWER);
 
-        return new View($this->getQuotedIdentifierName($view['view_name']), $view['text']);
+        return View::editor()
+            ->setQuotedName($view['view_name'])
+            ->setSQL($view['text'])
+            ->create();
     }
 
     /**
@@ -272,21 +275,6 @@ public function dropTable(string $name): void
         parent::dropTable($name);
     }
 
-    /**
-     * Returns the quoted representation of the given identifier name.
-     *
-     * Quotes non-uppercase identifiers explicitly to preserve case
-     * and thus make references to the particular identifier work.
-     */
-    private function getQuotedIdentifierName(string $identifier): string
-    {
-        if (preg_match('/[a-z]/', $identifier) === 1) {
-            return $this->platform->quoteSingleIdentifier($identifier);
-        }
-
-        return $identifier;
-    }
-
     protected function selectTableNames(string $databaseName): Result
     {
         $sql = sprintf(

src/Schema/PostgreSQLSchemaManager.php

@@ -90,13 +90,16 @@ private function getMaxIndexKeys(): int
     protected function _getPortableViewDefinition(array $view): View
     {
         // @phpstan-ignore missingType.checkedException
-        if ($view['schemaname'] === $this->getCurrentSchemaName()) {
-            $name = $view['viewname'];
+        if ($view['table_schema'] !== $this->getCurrentSchemaName()) {
+            $name = OptionallyQualifiedName::quoted($view['table_name'], $view['table_schema']);
         } else {
-            $name = $view['schemaname'] . '.' . $view['viewname'];
+            $name = OptionallyQualifiedName::quoted($view['table_name']);
         }
 
-        return new View($name, $view['definition']);
+        return View::editor()
+            ->setName($name)
+            ->setSQL($view['view_definition'])
+            ->create();
     }
 
     /**

src/Schema/SQLServerSchemaManager.php

@@ -225,7 +225,10 @@ protected function _getPortableDatabaseDefinition(array $database): string
      */
     protected function _getPortableViewDefinition(array $view): View
     {
-        return new View($view['name'], $view['definition']);
+        return View::editor()
+            ->setQuotedName($view['name'])
+            ->setSQL($view['definition'])
+            ->create();
     }
 
     /** @throws Exception */

src/Schema/SQLiteSchemaManager.php

@@ -125,7 +125,10 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
      */
     protected function _getPortableViewDefinition(array $view): View
     {
-        return new View($view['name'], $view['sql']);
+        return View::editor()
+            ->setQuotedName($view['name'])
+            ->setSQL($view['sql'])
+            ->create();
     }
 
     /**

src/Schema/View.php

@@ -4,10 +4,7 @@
 
 namespace Doctrine\DBAL\Schema;
 
-use Doctrine\DBAL\Schema\Exception\InvalidName;
 use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
-use Doctrine\DBAL\Schema\Name\Parser;
-use Doctrine\DBAL\Schema\Name\Parsers;
 
 /**
  * Representation of a Database View.
@@ -17,20 +14,12 @@
 final class View extends AbstractNamedObject
 {
     /** @internal Use {@link View::editor()} to instantiate an editor and {@link ViewEditor::create()} to create a view. */
-    public function __construct(string $name, private readonly string $sql)
+    public function __construct(OptionallyQualifiedName $name, private readonly string $sql)
     {
-        $parser = Parsers::getOptionallyQualifiedNameParser();
-
-        try {
-            $parsedName = $parser->parse($name);
-        } catch (Parser\Exception $e) {
-            throw InvalidName::fromParserException($name, $e);
-        }
-
-        parent::__construct($parsedName);
+        parent::__construct($name);
     }
 
-    public function getSql(): string
+    public function getSQL(): string
     {
         return $this->sql;
     }

src/Schema/ViewEditor.php

@@ -64,9 +64,6 @@ public function create(): View
             throw InvalidViewDefinition::sqlNotSet($this->name);
         }
 
-        return new View(
-            $this->name->toString(),
-            $this->sql,
-        );
+        return new View($this->name, $this->sql);
     }
 }