Dump triggers with delimiter (Fixes #76) (Case 114069)

relthyg · relthyg · commit 14e39f28a14c · 2021-07-29T12:21:16.000+02:00
diff --git a/src/Webfactory/Slimdump/Database/Dumper.php b/src/Webfactory/Slimdump/Database/Dumper.php
@@ -100,15 +100,19 @@ public function dumpTriggers(Connection $db, $tableName, $level = Table::DEFINER
 
         $this->output->writeln("-- BEGIN TRIGGERS $tableName", OutputInterface::OUTPUT_RAW);
 
+        $this->output->writeln("DELIMITER ;;\n");
+
         foreach ($triggers as $row) {
             $createTriggerCommand = $db->fetchColumn("SHOW CREATE TRIGGER `{$row['Trigger']}`", [], 2);
 
             if (Table::DEFINER_NO_DEFINER === $level) {
                 $createTriggerCommand = preg_replace('/DEFINER=`[^`]*`@`[^`]*` /', '', $createTriggerCommand);
             }
 
-            $this->output->writeln($createTriggerCommand.";\n", OutputInterface::OUTPUT_RAW);
+            $this->output->writeln($createTriggerCommand.";;\n", OutputInterface::OUTPUT_RAW);
         }
+
+        $this->output->writeln('DELIMITER ;');
     }
 
     public function dumpView(Connection $db, $viewName, $level = Table::DEFINER_NO_DEFINER)
diff --git a/test/Webfactory/Slimdump/Database/DumperTest.php b/test/Webfactory/Slimdump/Database/DumperTest.php
@@ -169,4 +169,27 @@ public function testDumpsTriggerWithoutDefiner()
         $output = $this->outputBuffer->fetch();
         $this->assertStringContainsString('CREATE TRIGGER trigger1 ...;', $output);
     }
+
+    public function testDumpsTriggerWithDelimiter()
+    {
+        $this->dbMock->expects($this->at(0))
+            ->method('quote')
+            ->with('test')
+            ->willReturn("'test'");
+
+        $this->dbMock->expects($this->at(1))
+            ->method('fetchAll')
+            ->with("SHOW TRIGGERS LIKE 'test'")
+            ->willReturn([['Trigger' => 'trigger1']]);
+
+        $this->dbMock->expects($this->at(2))
+            ->method('fetchColumn')
+            ->with('SHOW CREATE TRIGGER `trigger1`');
+
+        $this->dumper->dumpTriggers($this->dbMock, 'test');
+
+        $output = $this->outputBuffer->fetch();
+        $this->assertStringContainsString('DELIMITER ;;', $output);
+        $this->assertStringContainsString('DELIMITER ;', $output);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -100,15 +100,19 @@ public function dumpTriggers(Connection $db, $tableName, $level = Table::DEFINER`
`100`	`100`
`101`	`101`	`$this->output->writeln("-- BEGIN TRIGGERS $tableName", OutputInterface::OUTPUT_RAW);`
`102`	`102`
	`103`	`+ $this->output->writeln("DELIMITER ;;\n");`
	`104`	`+`
`103`	`105`	`foreach ($triggers as $row) {`
`104`	`106`	$createTriggerCommand = $db->fetchColumn("SHOW CREATE TRIGGER `{$row['Trigger']}`", [], 2);
`105`	`107`
`106`	`108`	`if (Table::DEFINER_NO_DEFINER === $level) {`
`107`	`109`	$createTriggerCommand = preg_replace('/DEFINER=`[^`]`@`[^`]` /', '', $createTriggerCommand);
`108`	`110`	`}`
`109`	`111`
`110`		`- $this->output->writeln($createTriggerCommand.";\n", OutputInterface::OUTPUT_RAW);`
	`112`	`+ $this->output->writeln($createTriggerCommand.";;\n", OutputInterface::OUTPUT_RAW);`
`111`	`113`	`}`
	`114`	`+`
	`115`	`+ $this->output->writeln('DELIMITER ;');`
`112`	`116`	`}`
`113`	`117`
`114`	`118`	`public function dumpView(Connection $db, $viewName, $level = Table::DEFINER_NO_DEFINER)`