Ticket #288: phing-2.3.0-dbdeploy-fix-undo-comment-syntax.diff

phing-2.3.0/tasks/ext/dbdeploy/DbDeployTask.php

@@ -107 +107 @@
                                 $fullFileName = $this->dir . '/' . $fileName;
                         $fh = fopen($fullFileName, 'r');
                         $contents = fread($fh,  filesize($fullFileName));
-                        $deploySQLFromFile = substr($contents,0,strpos($contents, '--//@UNDO'));                        
+                        $deploySQLFromFile = substr($contents,0,strpos($contents, '-- //@UNDO'));                       
                         $sqlToPerformDeploy .= $deploySQLFromFile;
                         $sqlToPerformDeploy .= 'UPDATE ' . DbDeployTask::$TABLE_NAME . ' SET complete_dt = ' . $this->dbmsSyntax->generateTimestamp() . ' WHERE change_number = ' . $fileChangeNumber . ' AND delta_set = \'' . $this->deltaSet . '\';' . "\n";
                         $sqlToPerformDeploy .= '-- Fragment ends: ' . $fileChangeNumber . ' --' . "\n";
@@ -126 +126 @@
                                 $fullFileName = $this->dir . '/' . $fileName;
                         $fh = fopen($fullFileName, 'r');
                         $contents = fread($fh,  filesize($fullFileName));
-                        $undoSQLFromFile = substr($contents,strpos($contents, '--//@UNDO')+9);                          
+                        $undoSQLFromFile = substr($contents,strpos($contents, '-- //@UNDO')+10);                        
                         $sqlToPerformUndo .= $undoSQLFromFile;
                         $sqlToPerformUndo .= 'DELETE FROM ' . DbDeployTask::$TABLE_NAME . ' WHERE change_number = ' . $fileChangeNumber . ' AND delta_set = \'' . $this->deltaSet . '\';' . "\n";
                         $sqlToPerformUndo .= '-- Fragment ends: ' . $fileChangeNumber . ' --' . "\n";