ifsnop / mysqldump-php

src/Ifsnop/Mysqldump/Mysqldump.php

Spacing +165 added lines, -166 removed lines

@@ -158,26 +158,26 @@ 
         $this->parseDsn($dsn);
 
         // this drops MYSQL dependency, only use the constant if it's defined
-        if ( "mysql" == $this->dbType ) {
+        if ("mysql" == $this->dbType) {
             $pdoSettingsDefault[PDO::MYSQL_ATTR_USE_BUFFERED_QUERY] = false;
         }
 
         $this->pdoSettings = self::array_replace_recursive($pdoSettingsDefault, $pdoSettings);
         $this->dumpSettings = self::array_replace_recursive($dumpSettingsDefault, $dumpSettings);
 
-        $this->dumpSettings['init_commands'][] = "SET NAMES " . $this->dumpSettings['default-character-set'];
+        $this->dumpSettings['init_commands'][] = "SET NAMES ".$this->dumpSettings['default-character-set'];
 
         if (false === $this->dumpSettings['skip-tz-utc']) {
             $this->dumpSettings['init_commands'][] = "SET TIME_ZONE='+00:00'";
         }
 
         $diff = array_diff(array_keys($this->dumpSettings), array_keys($dumpSettingsDefault));
-        if (count($diff)>0) {
-            throw new Exception("Unexpected value in dumpSettings: (" . implode(",", $diff) . ")");
+        if (count($diff) > 0) {
+            throw new Exception("Unexpected value in dumpSettings: (".implode(",", $diff).")");
         }
 
-        if ( !is_array($this->dumpSettings['include-tables']) ||
-            !is_array($this->dumpSettings['exclude-tables']) ) {
+        if (!is_array($this->dumpSettings['include-tables']) ||
+            !is_array($this->dumpSettings['exclude-tables'])) {
             throw new Exception("Include-tables and exclude-tables should be arrays");
         }
 
@@ -246,7 +246,7 @@ 
 
         $dsn = substr($dsn, $pos + 1);
 
-        foreach(explode(";", $dsn) as $kvp) {
+        foreach (explode(";", $dsn) as $kvp) {
             $kvpArr = explode("=", $kvp);
             $this->dsnArray[strtolower($kvpArr[0])] = $kvpArr[1];
         }
@@ -256,8 +256,7 @@ 
             throw new Exception("Missing host from DSN string");
         }
         $this->host = (!empty($this->dsnArray['host'])) ?
-            $this->dsnArray['host'] :
-            $this->dsnArray['unix_socket'];
+            $this->dsnArray['host'] : $this->dsnArray['unix_socket'];
 
         if (empty($this->dsnArray['dbname'])) {
             throw new Exception("Missing database name from DSN string");
@@ -279,7 +278,7 @@ 
         try {
             switch ($this->dbType) {
                 case 'sqlite':
-                    $this->dbHandler = @new PDO("sqlite:" . $this->dbName, null, null, $this->pdoSettings);
+                    $this->dbHandler = @new PDO("sqlite:".$this->dbName, null, null, $this->pdoSettings);
                     break;
                 case 'mysql':
                 case 'pgsql':
@@ -291,24 +290,24 @@ 
                         $this->pdoSettings
                     );
                     // Execute init commands once connected
-                    foreach($this->dumpSettings['init_commands'] as $stmt) {
+                    foreach ($this->dumpSettings['init_commands'] as $stmt) {
                         $this->dbHandler->exec($stmt);
                     }
                     // Store server version
                     $this->version = $this->dbHandler->getAttribute(PDO::ATTR_SERVER_VERSION);
                     break;
                 default:
-                    throw new Exception("Unsupported database type (" . $this->dbType . ")");
+                    throw new Exception("Unsupported database type (".$this->dbType.")");
             }
         } catch (PDOException $e) {
             throw new Exception(
-                "Connection to " . $this->dbType . " failed with message: " .
+                "Connection to ".$this->dbType." failed with message: ".
                 $e->getMessage()
             );
         }
 
-        if ( is_null($this->dbHandler) ) {
-            throw new Exception("Connection to ". $this->dbType . "failed");
+        if (is_null($this->dbHandler)) {
+            throw new Exception("Connection to ".$this->dbType."failed");
         }
 
         $this->dbHandler->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_NATURAL);
@@ -368,7 +367,7 @@ 
         // This check will be removed once include-tables supports regexps
         if (0 < count($this->dumpSettings['include-tables'])) {
             $name = implode(",", $this->dumpSettings['include-tables']);
-            throw new Exception("Table (" . $name . ") not found in database");
+            throw new Exception("Table (".$name.") not found in database");
         }
 
         $this->exportTables();
@@ -395,19 +394,19 @@ 
     private function getDumpFileHeader()
     {
         $header = '';
-        if ( !$this->dumpSettings['skip-comments'] ) {
+        if (!$this->dumpSettings['skip-comments']) {
             // Some info about software, source and time
-            $header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php" . PHP_EOL .
-                    "--" . PHP_EOL .
-                    "-- Host: {$this->host}\tDatabase: {$this->dbName}" . PHP_EOL .
-                    "-- ------------------------------------------------------" . PHP_EOL;
+            $header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php".PHP_EOL.
+                    "--".PHP_EOL.
+                    "-- Host: {$this->host}\tDatabase: {$this->dbName}".PHP_EOL.
+                    "-- ------------------------------------------------------".PHP_EOL;
 
-            if ( !empty($this->version) ) {
-                $header .= "-- Server version \t" . $this->version . PHP_EOL;
+            if (!empty($this->version)) {
+                $header .= "-- Server version \t".$this->version.PHP_EOL;
             }
 
-            if ( !$this->dumpSettings['skip-dump-date'] ) {
-                $header .= "-- Date: " . date('r') . PHP_EOL . PHP_EOL;
+            if (!$this->dumpSettings['skip-dump-date']) {
+                $header .= "-- Date: ".date('r').PHP_EOL.PHP_EOL;
             }
         }
         return $header;
@@ -424,7 +423,7 @@ 
         if (!$this->dumpSettings['skip-comments']) {
             $footer .= '-- Dump completed';
             if (!$this->dumpSettings['skip-dump-date']) {
-                $footer .= ' on: ' . date('r');
+                $footer .= ' on: '.date('r');
             }
             $footer .= PHP_EOL;
         }
@@ -512,10 +511,10 @@ 
         $match = false;
 
         foreach ($arr as $pattern) {
-            if ( '/' != $pattern[0] ) {
+            if ('/' != $pattern[0]) {
                 continue;
             }
-            if ( 1 == preg_match($pattern, $table) ) {
+            if (1 == preg_match($pattern, $table)) {
                 $match = true;
             }
         }
@@ -532,14 +531,14 @@ 
     {
         // Exporting tables one by one
         foreach ($this->tables as $table) {
-            if ( $this->matches($table, $this->dumpSettings['exclude-tables']) ) {
+            if ($this->matches($table, $this->dumpSettings['exclude-tables'])) {
                 continue;
             }
             $this->getTableStructure($table);
-            if ( false === $this->dumpSettings['no-data'] ) { // don't break compatibility with old trigger
+            if (false === $this->dumpSettings['no-data']) { // don't break compatibility with old trigger
                 $this->listValues($table);
-            } else if ( true === $this->dumpSettings['no-data']
-                 || $this->matches($table, $this->dumpSettings['no-data']) ) {
+            } else if (true === $this->dumpSettings['no-data']
+                 || $this->matches($table, $this->dumpSettings['no-data'])) {
                 continue;
             } else {
                 $this->listValues($table);
@@ -557,14 +556,14 @@ 
         if (false === $this->dumpSettings['no-create-info']) {
             // Exporting views one by one
             foreach ($this->views as $view) {
-                if ( $this->matches($view, $this->dumpSettings['exclude-tables']) ) {
+                if ($this->matches($view, $this->dumpSettings['exclude-tables'])) {
                     continue;
                 }
                 $this->tableColumnTypes[$view] = $this->getTableColumnTypes($view);
                 $this->getViewStructureTable($view);
             }
             foreach ($this->views as $view) {
-                if ( $this->matches($view, $this->dumpSettings['exclude-tables']) ) {
+                if ($this->matches($view, $this->dumpSettings['exclude-tables'])) {
                     continue;
                 }
                 $this->getViewStructureView($view);
@@ -623,9 +622,9 @@ 
         if (!$this->dumpSettings['no-create-info']) {
             $ret = '';
             if (!$this->dumpSettings['skip-comments']) {
-                $ret = "--" . PHP_EOL .
-                    "-- Table structure for table `$tableName`" . PHP_EOL .
-                    "--" . PHP_EOL . PHP_EOL;
+                $ret = "--".PHP_EOL.
+                    "-- Table structure for table `$tableName`".PHP_EOL.
+                    "--".PHP_EOL.PHP_EOL;
             }
             $stmt = $this->typeAdapter->show_create_table($tableName);
             foreach ($this->dbHandler->query($stmt) as $r) {
@@ -659,7 +658,7 @@ 
         );
         $columns->setFetchMode(PDO::FETCH_ASSOC);
 
-        foreach($columns as $key => $col) {
+        foreach ($columns as $key => $col) {
             $types = $this->typeAdapter->parseColumnType($col);
             $columnTypes[$col['Field']] = array(
                 'is_numeric'=> $types['is_numeric'],
@@ -683,9 +682,9 @@ 
     private function getViewStructureTable($viewName)
     {
         if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- Stand-In structure for view `${viewName}`" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
+            $ret = "--".PHP_EOL.
+                "-- Stand-In structure for view `${viewName}`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
             $this->compressManager->write($ret);
         }
         $stmt = $this->typeAdapter->show_create_view($viewName);
@@ -714,13 +713,13 @@ 
      */
     function createStandInTable($viewName) {
         $ret = array();
-        foreach($this->tableColumnTypes[$viewName] as $k => $v) {
+        foreach ($this->tableColumnTypes[$viewName] as $k => $v) {
             $ret[] = "`${k}` ${v['type_sql']}";
         }
-        $ret = implode(PHP_EOL . ",", $ret);
+        $ret = implode(PHP_EOL.",", $ret);
 
-        $ret = "CREATE TABLE IF NOT EXISTS `$viewName` (" .
-            PHP_EOL . $ret . PHP_EOL . ");" . PHP_EOL;
+        $ret = "CREATE TABLE IF NOT EXISTS `$viewName` (".
+            PHP_EOL.$ret.PHP_EOL.");".PHP_EOL;
 
         return $ret;
     }
@@ -735,9 +734,9 @@ 
     private function getViewStructureView($viewName)
     {
         if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- View structure for view `${viewName}`" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
+            $ret = "--".PHP_EOL.
+                "-- View structure for view `${viewName}`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
             $this->compressManager->write($ret);
         }
         $stmt = $this->typeAdapter->show_create_view($viewName);
@@ -787,9 +786,9 @@ 
     private function getProcedureStructure($procedureName)
     {
         if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- Dumping routines for database '" . $this->dbName . "'" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
+            $ret = "--".PHP_EOL.
+                "-- Dumping routines for database '".$this->dbName."'".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
             $this->compressManager->write($ret);
         }
         $stmt = $this->typeAdapter->show_create_procedure($procedureName);
@@ -810,9 +809,9 @@ 
     private function getEventStructure($eventName)
     {
         if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- Dumping events for database '" . $this->dbName . "'" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
+            $ret = "--".PHP_EOL.
+                "-- Dumping events for database '".$this->dbName."'".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
             $this->compressManager->write($ret);
         }
         $stmt = $this->typeAdapter->show_create_event($eventName);
@@ -900,7 +899,7 @@ 
         $lineSize = 0;
 
         $colStmt = $this->getColumnStmt($tableName);
-        $stmt = "SELECT " . implode(",", $colStmt) . " FROM `$tableName`";
+        $stmt = "SELECT ".implode(",", $colStmt)." FROM `$tableName`";
 
         if ($this->dumpSettings['where']) {
             $stmt .= " WHERE {$this->dumpSettings['where']}";
@@ -914,29 +913,29 @@ 
 
                 if ($this->dumpSettings['complete-insert']) {
                     $lineSize += $this->compressManager->write(
-                        "INSERT INTO `$tableName` (" .
-                        implode(", ", $colStmt) .
-                        ") VALUES (" . implode(",", $vals) . ")"
+                        "INSERT INTO `$tableName` (".
+                        implode(", ", $colStmt).
+                        ") VALUES (".implode(",", $vals).")"
                     );
                 } else {
                     $lineSize += $this->compressManager->write(
-                        "INSERT INTO `$tableName` VALUES (" . implode(",", $vals) . ")"
+                        "INSERT INTO `$tableName` VALUES (".implode(",", $vals).")"
                     );
                 }
                 $onlyOnce = false;
             } else {
-                $lineSize += $this->compressManager->write(",(" . implode(",", $vals) . ")");
+                $lineSize += $this->compressManager->write(",(".implode(",", $vals).")");
             }
             if (($lineSize > $this->dumpSettings['net_buffer_length']) ||
                     !$this->dumpSettings['extended-insert']) {
                 $onlyOnce = true;
-                $lineSize = $this->compressManager->write(";" . PHP_EOL);
+                $lineSize = $this->compressManager->write(";".PHP_EOL);
             }
         }
         $resultSet->closeCursor();
 
         if (!$onlyOnce) {
-            $this->compressManager->write(";" . PHP_EOL);
+            $this->compressManager->write(";".PHP_EOL);
         }
 
         $this->endListValues($tableName);
@@ -953,9 +952,9 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $this->compressManager->write(
-                "--" . PHP_EOL .
-                "-- Dumping data for table `$tableName`" .  PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL
+                "--".PHP_EOL.
+                "-- Dumping data for table `$tableName`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL
             );
         }
 
@@ -1041,7 +1040,7 @@ 
     function getColumnStmt($tableName)
     {
         $colStmt = array();
-        foreach($this->tableColumnTypes[$tableName] as $colName => $colType) {
+        foreach ($this->tableColumnTypes[$tableName] as $colName => $colType) {
             if ($colType['type'] == 'bit' && $this->dumpSettings['hex-blob']) {
                 $colStmt[] = "LPAD(HEX(`${colName}`),2,'0') AS `${colName}`";
             } else if ($colType['is_blob'] && $this->dumpSettings['hex-blob']) {
@@ -1089,11 +1088,11 @@ 
     public static function create($c)
     {
         $c = ucfirst(strtolower($c));
-        if (! CompressMethod::isValid($c)) {
+        if (!CompressMethod::isValid($c)) {
             throw new Exception("Compression method ($c) is not defined yet");
         }
 
-        $method =  __NAMESPACE__ . "\\" . "Compress" . $c;
+        $method = __NAMESPACE__."\\"."Compress".$c;
 
         return new $method;
     }
@@ -1105,7 +1104,7 @@ 
 
     public function __construct()
     {
-        if (! function_exists("bzopen")) {
+        if (!function_exists("bzopen")) {
             throw new Exception("Compression is enabled, but bzip2 lib is not installed or configured properly");
         }
     }
@@ -1143,7 +1142,7 @@ 
 
     public function __construct()
     {
-        if (! function_exists("gzopen")) {
+        if (!function_exists("gzopen")) {
             throw new Exception("Compression is enabled, but gzip lib is not installed or configured properly");
         }
     }
@@ -1243,10 +1242,10 @@ 
     public static function create($c, $dbHandler = null, $dumpSettings = array())
     {
         $c = ucfirst(strtolower($c));
-        if (! TypeAdapter::isValid($c)) {
+        if (!TypeAdapter::isValid($c)) {
             throw new Exception("Database type support for ($c) not yet available");
         }
-        $method =  __NAMESPACE__ . "\\" . "TypeAdapter" . $c;
+        $method = __NAMESPACE__."\\"."TypeAdapter".$c;
         return new $method($dbHandler, $dumpSettings);
     }
 
@@ -1267,8 +1266,8 @@ 
 
     public function show_create_table($tableName)
     {
-        return "SELECT tbl_name as 'Table', sql as 'Create Table' " .
-            "FROM sqlite_master " .
+        return "SELECT tbl_name as 'Table', sql as 'Create Table' ".
+            "FROM sqlite_master ".
             "WHERE type='table' AND tbl_name='$tableName'";
     }
 
@@ -1283,8 +1282,8 @@ 
 
     public function show_create_view($viewName)
     {
-        return "SELECT tbl_name as 'View', sql as 'Create View' " .
-            "FROM sqlite_master " .
+        return "SELECT tbl_name as 'View', sql as 'Create View' ".
+            "FROM sqlite_master ".
             "WHERE type='view' AND tbl_name='$viewName'";
     }
 
@@ -1526,9 +1525,9 @@ 
         $ret = "";
 
         $ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${databaseName}`".
-            " /*!40100 DEFAULT CHARACTER SET ${characterSet} " .
-            " COLLATE ${collationDb} */;" . PHP_EOL . PHP_EOL .
-            "USE `${databaseName}`;" . PHP_EOL . PHP_EOL;
+            " /*!40100 DEFAULT CHARACTER SET ${characterSet} ".
+            " COLLATE ${collationDb} */;".PHP_EOL.PHP_EOL.
+            "USE `${databaseName}`;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1558,23 +1557,23 @@ 
         return "SHOW CREATE EVENT `$eventName`";
     }
 
-    public function create_table( $row)
+    public function create_table($row)
     {
-        if ( !isset($row['Create Table']) ) {
+        if (!isset($row['Create Table'])) {
             throw new Exception("Error getting table code, unknown output");
         }
 
         $createTable = $row['Create Table'];
-        if ( $this->dumpSettings['reset-auto-increment'] ) {
+        if ($this->dumpSettings['reset-auto-increment']) {
             $match = "/AUTO_INCREMENT=[0-9]+/s";
             $replace = "";
             $createTable = preg_replace($match, $replace, $createTable);
         }
 
-        $ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;" . PHP_EOL .
-            "/*!40101 SET character_set_client = " . $this->dumpSettings['default-character-set'] . " */;" . PHP_EOL .
-            $createTable . ";" . PHP_EOL .
-            "/*!40101 SET character_set_client = @saved_cs_client */;" . PHP_EOL .
+        $ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;".PHP_EOL.
+            "/*!40101 SET character_set_client = ".$this->dumpSettings['default-character-set']." */;".PHP_EOL.
+            $createTable.";".PHP_EOL.
+            "/*!40101 SET character_set_client = @saved_cs_client */;".PHP_EOL.
             PHP_EOL;
         return $ret;
     }
@@ -1600,7 +1599,7 @@ 
             $viewStmt = $viewStmtReplaced;
         };
 
-        $ret .= $viewStmt . ';' . PHP_EOL . PHP_EOL;
+        $ret .= $viewStmt.';'.PHP_EOL.PHP_EOL;
         return $ret;
     }
 
@@ -1622,9 +1621,9 @@ 
             $triggerStmt = $triggerStmtReplaced;
         }
 
-        $ret .= "DELIMITER ;;" . PHP_EOL .
-            $triggerStmt . ";;" . PHP_EOL .
-            "DELIMITER ;" . PHP_EOL . PHP_EOL;
+        $ret .= "DELIMITER ;;".PHP_EOL.
+            $triggerStmt.";;".PHP_EOL.
+            "DELIMITER ;".PHP_EOL.PHP_EOL;
         return $ret;
     }
 
@@ -1632,19 +1631,19 @@ 
     {
         $ret = "";
         if (!isset($row['Create Procedure'])) {
-            throw new Exception("Error getting procedure code, unknown output. " .
+            throw new Exception("Error getting procedure code, unknown output. ".
                 "Please check 'https://bugs.mysql.com/bug.php?id=14564'");
         }
         $procedureStmt = $row['Create Procedure'];
 
-        $ret .= "/*!50003 DROP PROCEDURE IF EXISTS `" .
-            $row['Procedure'] . "` */;" . PHP_EOL .
-            "/*!40101 SET @saved_cs_client     = @@character_set_client */;" . PHP_EOL .
-            "/*!40101 SET character_set_client = " . $this->dumpSettings['default-character-set'] . " */;" . PHP_EOL .
-            "DELIMITER ;;" . PHP_EOL .
-            $procedureStmt . " ;;" . PHP_EOL .
-            "DELIMITER ;" . PHP_EOL .
-            "/*!40101 SET character_set_client = @saved_cs_client */;" . PHP_EOL . PHP_EOL;
+        $ret .= "/*!50003 DROP PROCEDURE IF EXISTS `".
+            $row['Procedure']."` */;".PHP_EOL.
+            "/*!40101 SET @saved_cs_client     = @@character_set_client */;".PHP_EOL.
+            "/*!40101 SET character_set_client = ".$this->dumpSettings['default-character-set']." */;".PHP_EOL.
+            "DELIMITER ;;".PHP_EOL.
+            $procedureStmt." ;;".PHP_EOL.
+            "DELIMITER ;".PHP_EOL.
+            "/*!40101 SET character_set_client = @saved_cs_client */;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1652,8 +1651,8 @@ 
     public function create_event($row)
     {
         $ret = "";
-        if ( !isset($row['Create Event']) ) {
-            throw new Exception("Error getting event code, unknown output. " .
+        if (!isset($row['Create Event'])) {
+            throw new Exception("Error getting event code, unknown output. ".
                 "Please check 'http://stackoverflow.com/questions/10853826/mysql-5-5-create-event-gives-syntax-error'");
         }
         $eventName = $row['Event'];
@@ -1670,27 +1669,27 @@ 
             $eventStmt = $eventStmtReplaced;
         }
 
-        $ret .= "/*!50106 SET @save_time_zone= @@TIME_ZONE */ ;" . PHP_EOL .
-            "/*!50106 DROP EVENT IF EXISTS `" . $eventName . "` */;" . PHP_EOL .
-            "DELIMITER ;;" . PHP_EOL .
-            "/*!50003 SET @saved_cs_client      = @@character_set_client */ ;;" . PHP_EOL .
-            "/*!50003 SET @saved_cs_results     = @@character_set_results */ ;;" . PHP_EOL .
-            "/*!50003 SET @saved_col_connection = @@collation_connection */ ;;" . PHP_EOL .
-            "/*!50003 SET character_set_client  = utf8 */ ;;" . PHP_EOL .
-            "/*!50003 SET character_set_results = utf8 */ ;;" . PHP_EOL .
-            "/*!50003 SET collation_connection  = utf8_general_ci */ ;;" . PHP_EOL .
-            "/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;" . PHP_EOL .
-            "/*!50003 SET sql_mode              = '" . $sqlMode . "' */ ;;" . PHP_EOL .
-            "/*!50003 SET @saved_time_zone      = @@time_zone */ ;;" . PHP_EOL .
-            "/*!50003 SET time_zone             = 'SYSTEM' */ ;;" . PHP_EOL .
-            $eventStmt . " ;;" . PHP_EOL .
-            "/*!50003 SET time_zone             = @saved_time_zone */ ;;" . PHP_EOL .
-            "/*!50003 SET sql_mode              = @saved_sql_mode */ ;;" . PHP_EOL .
-            "/*!50003 SET character_set_client  = @saved_cs_client */ ;;" . PHP_EOL .
-            "/*!50003 SET character_set_results = @saved_cs_results */ ;;" . PHP_EOL .
-            "/*!50003 SET collation_connection  = @saved_col_connection */ ;;" . PHP_EOL .
-            "DELIMITER ;" . PHP_EOL .
-            "/*!50106 SET TIME_ZONE= @save_time_zone */ ;" . PHP_EOL . PHP_EOL;
+        $ret .= "/*!50106 SET @save_time_zone= @@TIME_ZONE */ ;".PHP_EOL.
+            "/*!50106 DROP EVENT IF EXISTS `".$eventName."` */;".PHP_EOL.
+            "DELIMITER ;;".PHP_EOL.
+            "/*!50003 SET @saved_cs_client      = @@character_set_client */ ;;".PHP_EOL.
+            "/*!50003 SET @saved_cs_results     = @@character_set_results */ ;;".PHP_EOL.
+            "/*!50003 SET @saved_col_connection = @@collation_connection */ ;;".PHP_EOL.
+            "/*!50003 SET character_set_client  = utf8 */ ;;".PHP_EOL.
+            "/*!50003 SET character_set_results = utf8 */ ;;".PHP_EOL.
+            "/*!50003 SET collation_connection  = utf8_general_ci */ ;;".PHP_EOL.
+            "/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;".PHP_EOL.
+            "/*!50003 SET sql_mode              = '".$sqlMode."' */ ;;".PHP_EOL.
+            "/*!50003 SET @saved_time_zone      = @@time_zone */ ;;".PHP_EOL.
+            "/*!50003 SET time_zone             = 'SYSTEM' */ ;;".PHP_EOL.
+            $eventStmt." ;;".PHP_EOL.
+            "/*!50003 SET time_zone             = @saved_time_zone */ ;;".PHP_EOL.
+            "/*!50003 SET sql_mode              = @saved_sql_mode */ ;;".PHP_EOL.
+            "/*!50003 SET character_set_client  = @saved_cs_client */ ;;".PHP_EOL.
+            "/*!50003 SET character_set_results = @saved_cs_results */ ;;".PHP_EOL.
+            "/*!50003 SET collation_connection  = @saved_col_connection */ ;;".PHP_EOL.
+            "DELIMITER ;".PHP_EOL.
+            "/*!50106 SET TIME_ZONE= @save_time_zone */ ;".PHP_EOL.PHP_EOL;
             // Commented because we are doing this in restore_parameters()
             // "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;" . PHP_EOL . PHP_EOL;
 
@@ -1701,8 +1700,8 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
+        return "SELECT TABLE_NAME AS tbl_name ".
+            "FROM INFORMATION_SCHEMA.TABLES ".
             "WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
     }
 
@@ -1710,8 +1709,8 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
+        return "SELECT TABLE_NAME AS tbl_name ".
+            "FROM INFORMATION_SCHEMA.TABLES ".
             "WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
     }
 
@@ -1733,8 +1732,8 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "SELECT SPECIFIC_NAME AS procedure_name " .
-            "FROM INFORMATION_SCHEMA.ROUTINES " .
+        return "SELECT SPECIFIC_NAME AS procedure_name ".
+            "FROM INFORMATION_SCHEMA.ROUTINES ".
             "WHERE ROUTINE_TYPE='PROCEDURE' AND ROUTINE_SCHEMA='${args[0]}'";
     }
 
@@ -1748,8 +1747,8 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "SELECT EVENT_NAME AS event_name " .
-            "FROM INFORMATION_SCHEMA.EVENTS " .
+        return "SELECT EVENT_NAME AS event_name ".
+            "FROM INFORMATION_SCHEMA.EVENTS ".
             "WHERE EVENT_SCHEMA='${args[0]}'";
     }
 
@@ -1785,19 +1784,19 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "LOCK TABLES `${args[0]}` WRITE;" . PHP_EOL;
+        return "LOCK TABLES `${args[0]}` WRITE;".PHP_EOL;
     }
 
     public function end_add_lock_table()
     {
-        return "UNLOCK TABLES;" . PHP_EOL;
+        return "UNLOCK TABLES;".PHP_EOL;
     }
 
     public function start_add_disable_keys()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;" .
+        return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;".
             PHP_EOL;
     }
 
@@ -1805,57 +1804,57 @@ 
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;" .
+        return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;".
             PHP_EOL;
     }
 
     public function start_disable_autocommit()
     {
-        return "SET autocommit=0;" . PHP_EOL;
+        return "SET autocommit=0;".PHP_EOL;
     }
 
     public function end_disable_autocommit()
     {
-        return "COMMIT;" . PHP_EOL;
+        return "COMMIT;".PHP_EOL;
     }
 
     public function add_drop_database()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;" .
-            PHP_EOL . PHP_EOL;
+        return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;".
+            PHP_EOL.PHP_EOL;
     }
 
     public function add_drop_trigger()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "DROP TRIGGER IF EXISTS `${args[0]}`;" . PHP_EOL;
+        return "DROP TRIGGER IF EXISTS `${args[0]}`;".PHP_EOL;
     }
 
     public function drop_table()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL;
+        return "DROP TABLE IF EXISTS `${args[0]}`;".PHP_EOL;
     }
 
     public function drop_view()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL .
-                "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;" . PHP_EOL;
+        return "DROP TABLE IF EXISTS `${args[0]}`;".PHP_EOL.
+                "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;".PHP_EOL;
     }
 
     public function getDatabaseHeader()
     {
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
-        return "--" . PHP_EOL .
-            "-- Current Database: `${args[0]}`" . PHP_EOL .
-            "--" . PHP_EOL . PHP_EOL;
+        return "--".PHP_EOL.
+            "-- Current Database: `${args[0]}`".PHP_EOL.
+            "--".PHP_EOL.PHP_EOL;
     }
 
     /**
@@ -1870,10 +1869,10 @@ 
         $colInfo = array();
         $colParts = explode(" ", $colType['Type']);
 
-        if($fparen = strpos($colParts[0], "("))
+        if ($fparen = strpos($colParts[0], "("))
         {
             $colInfo['type'] = substr($colParts[0], 0, $fparen);
-            $colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
+            $colInfo['length'] = str_replace(")", "", substr($colParts[0], $fparen + 1));
             $colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
         }
         else
@@ -1891,20 +1890,20 @@ 
 
     public function backup_parameters()
     {
-        $ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40101 SET NAMES " . $this->dumpSettings['default-character-set'] . " */;" . PHP_EOL;
+        $ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;".PHP_EOL.
+            "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;".PHP_EOL.
+            "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;".PHP_EOL.
+            "/*!40101 SET NAMES ".$this->dumpSettings['default-character-set']." */;".PHP_EOL;
 
         if (false === $this->dumpSettings['skip-tz-utc']) {
-            $ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;" . PHP_EOL .
-                "/*!40103 SET TIME_ZONE='+00:00' */;" . PHP_EOL;
+            $ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;".PHP_EOL.
+                "/*!40103 SET TIME_ZONE='+00:00' */;".PHP_EOL;
         }
 
-        $ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;" . PHP_EOL .
-            "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;" . PHP_EOL .
-            "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;" . PHP_EOL .
-            "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;" . PHP_EOL .PHP_EOL;
+        $ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;".PHP_EOL.
+            "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;".PHP_EOL.
+            "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;".PHP_EOL.
+            "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1914,16 +1913,16 @@ 
         $ret = "";
 
         if (false === $this->dumpSettings['skip-tz-utc']) {
-            $ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;" . PHP_EOL;
+            $ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;".PHP_EOL;
         }
 
-        $ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;" . PHP_EOL .
-            "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;" . PHP_EOL .
-            "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;" . PHP_EOL . PHP_EOL;
+        $ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;".PHP_EOL.
+            "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;".PHP_EOL.
+            "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;".PHP_EOL.
+            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;".PHP_EOL.
+            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;".PHP_EOL.
+            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;".PHP_EOL.
+            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1938,7 +1937,7 @@ 
      */
     private function check_parameters($num_args, $expected_num_args, $method_name)
     {
-        if ( $num_args != $expected_num_args ) {
+        if ($num_args != $expected_num_args) {
             throw new Exception("Unexpected parameter passed to $method_name");
         }
         return;

Braces +1 added lines, -2 removed lines

@@ -1875,8 +1875,7 @@
             $colInfo['type'] = substr($colParts[0], 0, $fparen);
             $colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
             $colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
-        }
-        else
+        } else
         {
             $colInfo['type'] = $colParts[0];
         }