Commit14e39f2

committed

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

1 parent8b9feea commit14e39f2Copy full SHA for 14e39f2

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 5 additions & 1 deletion

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 ($triggersas$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`	`publicfunctiondumpView(Connection$db,$viewName,$level = Table::DEFINER_NO_DEFINER)`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,4 +169,27 @@ public function testDumpsTriggerWithoutDefiner()`
`169`	`169`	`$output =$this->outputBuffer->fetch();`
`170`	`170`	`$this->assertStringContainsString('CREATE TRIGGER trigger1 ...;',$output);`
`171`	`171`	`}`
	`172`	`+`
	`173`	`+publicfunctiontestDumpsTriggerWithDelimiter()`
	`174`	`+ {`
	`175`	`+$this->dbMock->expects($this->at(0))`
	`176`	`+ ->method('quote')`
	`177`	`+ ->with('test')`
	`178`	`+ ->willReturn("'test'");`
	`179`	`+`
	`180`	`+$this->dbMock->expects($this->at(1))`
	`181`	`+ ->method('fetchAll')`
	`182`	`+ ->with("SHOW TRIGGERS LIKE 'test'")`
	`183`	`+ ->willReturn([['Trigger' =>'trigger1']]);`
	`184`	`+`
	`185`	`+$this->dbMock->expects($this->at(2))`
	`186`	`+ ->method('fetchColumn')`
	`187`	+ ->with('SHOW CREATE TRIGGER `trigger1`');
	`188`	`+`
	`189`	`+$this->dumper->dumpTriggers($this->dbMock,'test');`
	`190`	`+`
	`191`	`+$output =$this->outputBuffer->fetch();`
	`192`	`+$this->assertStringContainsString('DELIMITER ;;',$output);`
	`193`	`+$this->assertStringContainsString('DELIMITER ;',$output);`
	`194`	`+ }`
`172`	`195`	`}`

Comments

(0)