Merge pull request #7168 from morozov/remove-identifier

Remove Schema\Identifier

Author: morozov

src/DriverManager.php

@@ -26,7 +26,7 @@
  * @phpstan-type OverrideParams = array{
  *     application_name?: string,
  *     charset?: string,
- *     dbname?: string,
+ *     dbname?: non-empty-string,
  *     defaultTableOptions?: array<string, mixed>,
  *     driver?: key-of<self::DRIVER_MAP>,
  *     driverClass?: class-string<Driver>,
@@ -39,14 +39,14 @@
  *     port?: int,
  *     serverVersion?: string,
  *     sessionMode?: int,
- *     user?: string,
+ *     user?: non-empty-string,
  *     unix_socket?: string,
  *     wrapperClass?: class-string<Connection>,
  * }
  * @phpstan-type Params = array{
  *     application_name?: string,
  *     charset?: string,
- *     dbname?: string,
+ *     dbname?: non-empty-string,
  *     defaultTableOptions?: array<string, mixed>,
  *     driver?: key-of<self::DRIVER_MAP>,
  *     driverClass?: class-string<Driver>,
@@ -62,7 +62,7 @@
  *     replica?: array<OverrideParams>,
  *     serverVersion?: string,
  *     sessionMode?: int,
- *     user?: string,
+ *     user?: non-empty-string,
  *     wrapperClass?: class-string<Connection>,
  *     unix_socket?: string,
  * }

src/Platforms/AbstractMySQLPlatform.php

@@ -243,7 +243,9 @@ protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array
             $sql[] = 'TEMPORARY';
         }
 
-        $sql[] = 'TABLE ' . $tableName->toSQL($this) . ' (' . implode(', ', $elements) . ')';
+        $tableNameSQL = $tableName->toSQL($this);
+
+        $sql[] = sprintf('TABLE %s (%s)', $tableNameSQL, implode(', ', $elements));
 
         $tableOptions = $this->buildTableOptions($parameters);
 
@@ -259,19 +261,19 @@ protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array
 
         if (isset($parameters['foreignKeys'])) {
             foreach ($parameters['foreignKeys'] as $definition) {
-                $sql[] = $this->getCreateForeignKeySQL($definition, $tableName->toSQL($this));
+                $sql[] = $this->getCreateForeignKeySQL($definition, $tableNameSQL);
             }
         }
 
         return $sql;
     }
 
-    public function getCreateIndexSQL(Index $index, string $table): string
+    public function getCreateIndexSQL(Index $index, string $tableName): string
     {
         $this->ensureIndexIsNotClustered($index);
         $this->ensureIndexIsNotPartial($index);
 
-        return parent::getCreateIndexSQL($index, $table);
+        return parent::getCreateIndexSQL($index, $tableName);
     }
 
     /**
@@ -557,19 +559,22 @@ protected function getAdvancedForeignKeyOptionsSQL(ForeignKeyConstraint $foreign
         return $query;
     }
 
-    public function getDropIndexSQL(string $name, string $table): string
+    public function getDropIndexSQL(string $indexName, string $tableName): string
     {
-        return 'DROP INDEX ' . $name . ' ON ' . $table;
+        $parsedIndexName = $this->parseUnqualifiedName($indexName);
+        $parsedTableName = $this->parseOptionallyQualifiedName($tableName);
+
+        return sprintf('DROP INDEX %s ON %s', $parsedIndexName->toSQL($this), $parsedTableName->toSQL($this));
     }
 
     /**
      * The `ALTER TABLE ... DROP CONSTRAINT` syntax is only available as of MySQL 8.0.19.
      *
      * @link https://dev.mysql.com/doc/refman/8.0/en/alter-table.html
      */
-    public function getDropUniqueConstraintSQL(string $name, string $tableName): string
+    public function getDropUniqueConstraintSQL(string $constraintName, string $tableName): string
     {
-        return $this->getDropIndexSQL($name, $tableName);
+        return $this->getDropIndexSQL($constraintName, $tableName);
     }
 
     public function getSetTransactionIsolationSQL(TransactionIsolationLevel $level): string
@@ -621,9 +626,11 @@ protected function initializeDoctrineTypeMappings(): void
      * MySQL commits a transaction implicitly when DROP TABLE is executed, however not
      * if DROP TEMPORARY TABLE is executed.
      */
-    public function getDropTemporaryTableSQL(string $table): string
+    public function getDropTemporaryTableSQL(string $tableName): string
     {
-        return 'DROP TEMPORARY TABLE ' . $table;
+        $parsedName = $this->parseOptionallyQualifiedName($tableName);
+
+        return sprintf('DROP TEMPORARY TABLE %s', $parsedName->toSQL($this));
     }
 
     /**