Ticket #413: delimiter.diff

classes/phing/tasks/ext/pdo/PDOSQLExecTask.php

@@ -407 +407 @@
                 $line = ProjectConfigurator::replaceProperties($this->project, $line,
                         $this->project->getProperties());
 
-                if (StringHelper::startsWith("//", $line) ||
+                if (($line != $this->delimiter) && (
+                    StringHelper::startsWith("//", $line) ||
                     StringHelper::startsWith("--", $line) ||
-                    StringHelper::startsWith("#", $line)) {
+                    StringHelper::startsWith("#", $line))) {
                     continue;
                 }
 
@@ -418 +419 @@
                     continue;
                 }
 
+                // MySQL supports defining new delimiters
+                if (preg_match('/DELIMITER [\'"]?([^\'" $]+)[\'"]?/i', $line, $matches)) {
+                    $this->setDelimiter($matches[1]);
+                    continue;
+                }
+
                 if ($sqlBacklog !== "") {
                     $sql = $sqlBacklog;
                     $sqlBacklog = "";