MAGETWO-95595: Index names are ignored by declarative schema

Author: fascinosum

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php

@@ -33,7 +33,7 @@
             'constraint' => [
                 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => [
                     'type' => 'foreign',
-                    'name' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
                     'column' => 'tinyint',
                     'table' => 'test_table',
                     'referenceTable' => 'reference_table',

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php

@@ -93,7 +93,7 @@
                         'tinyint_ref' => 'tinyint_ref',
                     ],
                     'type' => 'primary',
-                    'name' => 'tinyint_primary',
+                    'referenceId' => 'tinyint_primary',
                 ],
             ],
             'name' => 'reference_table',
@@ -125,7 +125,7 @@
                         'int_auto_increment_with_nullable' => 'int_auto_increment_with_nullable',
                     ],
                     'type' => 'unique',
-                    'name' => 'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE',
+                    'referenceId' => 'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE',
                 ],
             ],
             'name' => 'auto_increment_test',
@@ -231,11 +231,11 @@
                         'bigint' => 'bigint',
                     ],
                     'type' => 'unique',
-                    'name' => 'TEST_TABLE_SMALLINT_BIGINT',
+                    'referenceId' => 'TEST_TABLE_SMALLINT_BIGINT',
                 ],
                 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => [
                     'type' => 'foreign',
-                    'name' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
                     'column' => 'tinyint',
                     'table' => 'test_table',
                     'referenceTable' => 'reference_table',
@@ -249,7 +249,7 @@
                         'tinyint' => 'tinyint',
                         'bigint' => 'bigint',
                     ],
-                    'name' => 'TEST_TABLE_TINYINT_BIGINT',
+                    'referenceId' => 'TEST_TABLE_TINYINT_BIGINT',
                     'indexType' => 'btree',
                 ],
             ],

dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php

@@ -79,8 +79,26 @@ public function testInstallation()
 
         //Second time installation should not find anything as we do not change anything
         self::assertNull($diff->getAll());
+        $this->compareStructures();
+    }
+
+    /**
+     * Compare structure of DB and declared structure.
+     */
+    private function compareStructures()
+    {
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getTrimmedData(), $shardData);
+        foreach ($this->getTrimmedData() as $tableName => $sql) {
+            $this->assertArrayHasKey($tableName, $shardData);
+            /**
+             * MySQL 8.0 and above does not provide information about the ON DELETE instruction
+             * if ON DELETE NO ACTION
+             */
+            if (preg_match('#ON DELETE\s+NO ACTION#i', $shardData[$tableName] === 1)) {
+                preg_replace('#ON DELETE\s+NO ACTION#i', '', $sql);
+                self::assertEquals($sql, $shardData[$tableName]);
+            }
+        }
     }
 
     /**
@@ -110,8 +128,7 @@ public function testInstallationWithColumnsModification()
             $this->schemaConfig->getDbConfig()
         );
         self::assertNull($diff->getAll());
-        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getTrimmedData(), $shardData);
+        $this->compareStructures();
     }
 
     /**
@@ -156,8 +173,7 @@ public function testInstallationWithColumnsRemoval()
             $this->schemaConfig->getDbConfig()
         );
         self::assertNull($diff->getAll());
-        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getTrimmedData(), $shardData);
+        $this->compareStructures();
     }
 
     /**

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php

@@ -95,7 +95,7 @@ public function fromDefinition(array $data)
                     'column' => $match[2],
                     'referenceTable' => $match[5],
                     'referenceColumn' => $match[6],
-                    'onDelete' => isset($match[7]) ? $match[8] : ''
+                    'onDelete' => isset($match[7]) ? $match[8] : 'NO ACTION'
                 ];
             }
         }