Merge pull request #6878 from morozov/remove-get-index-declaration-sql

Move MySQL-related code out of abstract platform

Author: morozov

src/Platforms/AbstractMySQLPlatform.php

@@ -414,6 +414,15 @@ protected function getPreAlterTableIndexForeignKeySQL(TableDiff $diff): array
         return array_merge($sql, parent::getPreAlterTableIndexForeignKeySQL($diff));
     }
 
+    /**
+     * Returns the SQL fragment representing an index.
+     */
+    private function getIndexDeclarationSQL(Index $index): string
+    {
+        return $this->getCreateIndexSQLFlags($index) . 'INDEX ' . $index->getObjectName()->toSQL($this)
+            . ' (' . implode(', ', $index->getQuotedColumns($this)) . ')';
+    }
+
     protected function getCreateIndexSQLFlags(Index $index): string
     {
         $type = '';

src/Platforms/AbstractPlatform.php

@@ -995,10 +995,6 @@ protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array
             $elements[] = $this->getPrimaryKeyConstraintDeclarationSQL($parameters['primaryKey']);
         }
 
-        foreach ($parameters['indexes'] as $definition) {
-            $elements[] = $this->getIndexDeclarationSQL($definition);
-        }
-
         $elements = array_merge($elements, $this->getCheckDeclarationSQL($columns));
 
         $query = 'CREATE TABLE ' . $tableName->toSQL($this) . ' (' . implode(', ', $elements) . ')';
@@ -1447,26 +1443,6 @@ protected function getUniqueConstraintDeclarationSQL(UniqueConstraint $constrain
         return implode(' ', $chunks);
     }
 
-    /**
-     * Obtains DBMS specific SQL code portion needed to set an index
-     * declaration to be used in statements like CREATE TABLE.
-     *
-     * @param Index $index The index definition.
-     *
-     * @return string DBMS specific SQL code portion needed to set an index.
-     */
-    protected function getIndexDeclarationSQL(Index $index): string
-    {
-        $columns = $index->getColumns();
-
-        if (count($columns) === 0) {
-            throw new InvalidArgumentException('Incomplete definition. "columns" required.');
-        }
-
-        return $this->getCreateIndexSQLFlags($index) . 'INDEX ' . $index->getObjectName()->toSQL($this)
-            . ' (' . implode(', ', $index->getQuotedColumns($this)) . ')' . $this->getPartialIndexSQL($index);
-    }
-
     /**
      * Some vendors require temporary table names to be qualified specially.
      */

src/Platforms/DB2Platform.php

@@ -241,28 +241,18 @@ public function getCurrentTimestampSQL(): string
         return 'CURRENT TIMESTAMP';
     }
 
-    protected function getIndexDeclarationSQL(Index $index): string
-    {
-        // Index declaration in statements like CREATE TABLE is not supported.
-        throw NotSupported::new(__METHOD__);
-    }
-
     /**
      * {@inheritDoc}
      */
     protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array $columns, array $parameters): array
     {
-        $indexes = $parameters['indexes'];
-
-        $parameters['indexes'] = [];
-
-        $sqls = parent::_getCreateTableSQL($tableName, $columns, $parameters);
+        $sql = parent::_getCreateTableSQL($tableName, $columns, $parameters);
 
-        foreach ($indexes as $definition) {
-            $sqls[] = $this->getCreateIndexSQL($definition, $tableName->toSQL($this));
+        foreach ($parameters['indexes'] as $index) {
+            $sql[] = $this->getCreateIndexSQL($index, $tableName->toSQL($this));
         }
 
-        return $sqls;
+        return $sql;
     }
 
     /**

src/Platforms/OraclePlatform.php

@@ -319,10 +319,6 @@ public function getListSequencesSQL(string $database): string
      */
     protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array $columns, array $parameters): array
     {
-        $indexes = $parameters['indexes'];
-
-        $parameters['indexes'] = [];
-
         $sql = parent::_getCreateTableSQL($tableName, $columns, $parameters);
 
         foreach ($columns as $column) {
@@ -339,7 +335,7 @@ protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array
             $sql = array_merge($sql, $this->getCreateAutoincrementSql($tableName, $column['name']));
         }
 
-        foreach ($indexes as $index) {
+        foreach ($parameters['indexes'] as $index) {
             $sql[] = $this->getCreateIndexSQL($index, $tableName->toSQL($this));
         }