Merge #19090 - Fix #18495 - exporting of triggers

Pull-request: #19090 Fixes: #18495 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 15, 2024 · ec78dfd · ec78dfd
2 parents 698a295 + ec2d9ba
commit ec78dfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
@@ -2127,7 +2127,7 @@ public function exportStructure(
                             $usedAlias = true;
                         }
 
-                        $triggerQuery .= 'DELIMITER ;' . $crlf;
+                        $triggerQuery .= $delimiter . $crlf . 'DELIMITER ;' . $crlf;
                     }
 
                     // One warning per table.

diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -1061,7 +1061,7 @@ public function testExportStructure(): void
         $this->assertIsString($result);
         $this->assertStringContainsString('-- Triggers test_table', $result);
         $this->assertStringContainsString(
-            'CREATE TRIGGER `test_trigger` AFTER INSERT ON `test_table` FOR EACH ROW BEGIN END',
+            "CREATE TRIGGER `test_trigger` AFTER INSERT ON `test_table` FOR EACH ROW BEGIN END\n$$",
             $result
         );