[BUGFIX] Build indexes with foreign_field and foreign_table_field

Fixes: #398

Author: nhovratov

Build/content-blocks-examples/ContentBlocks/ContentElements/tabs/config.yaml

@@ -6,5 +6,15 @@ fields:
     type: Collection
     minitems: 1
     foreign_table: tt_content
+    shareAcrossFields: true
+    shareAcrossTables: true
+    allowedRecordTypes:
+      - example_text
+  - identifier: tabs_item2
+    type: Collection
+    minitems: 1
+    foreign_table: tt_content
+    shareAcrossFields: true
+    shareAcrossTables: true
     allowedRecordTypes:
       - example_text

Classes/Generator/SqlGenerator.php

@@ -71,24 +71,33 @@ public function generate(): array
     protected function handleParentReferences(TableDefinition $tableDefinition): array
     {
         $sql = [];
+        $indexes = [];
         foreach ($tableDefinition->parentReferences as $parentReference) {
             $parentTcaConfig = $parentReference->getTca()['config'];
             // Generate indexes for the parent uid field for better performance.
             if (isset($parentTcaConfig['foreign_field'])) {
                 $foreignField = $parentTcaConfig['foreign_field'];
-                $sqlStatement = 'CREATE TABLE `' . $tableDefinition->table . '` (KEY parent_uid (' . $foreignField . '));';
-                if (!in_array($sqlStatement, $sql, true)) {
-                    $sql[] = $sqlStatement;
-                }
+                $indexes[$tableDefinition->table][] = $foreignField;
+            }
+            if (isset($parentTcaConfig['foreign_table_field'])) {
+                $foreignTableName = $parentTcaConfig['foreign_table_field'];
+                $indexes[$tableDefinition->table][] = $foreignTableName;
             }
             // The foreign_match_fields fields are automatically added, so that feature "shareAcrossFields" works.
             foreach ($parentTcaConfig['foreign_match_fields'] ?? [] as $foreignMatchField => $foreignMatchValue) {
+                $indexes[$tableDefinition->table][] = $foreignMatchField;
                 $sqlStatement = 'CREATE TABLE `' . $tableDefinition->table . '` (`' . $foreignMatchField . '` varchar(255) DEFAULT \'\' NOT NULL);';
                 if (!in_array($sqlStatement, $sql, true)) {
                     $sql[] = $sqlStatement;
                 }
             }
         }
+        foreach ($indexes as $table => $indexFields) {
+            $sqlStatement = 'CREATE TABLE `' . $table . '` (KEY parent_uid (' . implode(', ', $indexFields) . '));';
+            if (!in_array($sqlStatement, $sql, true)) {
+                $sql[] = $sqlStatement;
+            }
+        }
         return $sql;
     }
 }

Tests/Unit/Generator/SqlGeneratorTest.php

@@ -73,8 +73,8 @@ public static function generateReturnsExpectedSqlStatementsDataProvider(): itera
                 ],
             ],
             'expected' => [
-                'CREATE TABLE `foobar` (KEY parent_uid (foreign_table_parent_uid));',
                 "CREATE TABLE `foobar` (`fieldname` varchar(255) DEFAULT '' NOT NULL);",
+                'CREATE TABLE `foobar` (KEY parent_uid (foreign_table_parent_uid, tablenames, fieldname));',
             ],
         ];