ifsnop / mysqldump-php

src/Ifsnop/Mysqldump/Mysqldump.php

Indentation +191 added lines, -191 removed lines

@@ -110,50 +110,50 @@ 
      * @param array  $pdoSettings  PDO configured attributes
      */
     public function __construct(
-      $dsn = '',
-      $user = '',
-      $pass = '',
-      $dumpSettings = array(),
-      $pdoSettings = array()
+        $dsn = '',
+        $user = '',
+        $pass = '',
+        $dumpSettings = array(),
+        $pdoSettings = array()
     ) {
         $dumpSettingsDefault = array(
-          'include-tables' => array(),
-          'exclude-tables' => array(),
-          'compress' => Mysqldump::NONE,
-          'init_commands' => array(),
-          'no-data' => array(),
-          'reset-auto-increment' => false,
-          'add-drop-database' => false,
-          'add-drop-table' => false,
-          'add-drop-trigger' => true,
-          'add-locks' => true,
-          'complete-insert' => false,
-          'databases' => false,
-          'default-character-set' => Mysqldump::UTF8,
-          'disable-keys' => true,
-          'extended-insert' => true,
-          'events' => false,
-          'hex-blob' => true, /* faster than escaped content */
-          'insert-ignore' => false,
-          'net_buffer_length' => self::MAXLINESIZE,
-          'no-autocommit' => true,
-          'no-create-info' => false,
-          'lock-tables' => true,
-          'routines' => false,
-          'single-transaction' => true,
-          'skip-triggers' => false,
-          'skip-tz-utc' => false,
-          'skip-comments' => false,
-          'skip-dump-date' => false,
-          'skip-definer' => false,
-          'where' => '',
+            'include-tables' => array(),
+            'exclude-tables' => array(),
+            'compress' => Mysqldump::NONE,
+            'init_commands' => array(),
+            'no-data' => array(),
+            'reset-auto-increment' => false,
+            'add-drop-database' => false,
+            'add-drop-table' => false,
+            'add-drop-trigger' => true,
+            'add-locks' => true,
+            'complete-insert' => false,
+            'databases' => false,
+            'default-character-set' => Mysqldump::UTF8,
+            'disable-keys' => true,
+            'extended-insert' => true,
+            'events' => false,
+            'hex-blob' => true, /* faster than escaped content */
+            'insert-ignore' => false,
+            'net_buffer_length' => self::MAXLINESIZE,
+            'no-autocommit' => true,
+            'no-create-info' => false,
+            'lock-tables' => true,
+            'routines' => false,
+            'single-transaction' => true,
+            'skip-triggers' => false,
+            'skip-tz-utc' => false,
+            'skip-comments' => false,
+            'skip-dump-date' => false,
+            'skip-definer' => false,
+            'where' => '',
             /* deprecated */
-          'disable-foreign-keys-check' => true
+            'disable-foreign-keys-check' => true
         );
 
         $pdoSettingsDefault = array(
-          PDO::ATTR_PERSISTENT => true,
-          PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+            PDO::ATTR_PERSISTENT => true,
+            PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         );
 
         $this->user = $user;
@@ -286,10 +286,10 @@ 
                 case 'pgsql':
                 case 'dblib':
                     $this->dbHandler = @new PDO(
-                      $this->dsn,
-                      $this->user,
-                      $this->pass,
-                      $this->pdoSettings
+                        $this->dsn,
+                        $this->user,
+                        $this->pass,
+                        $this->pdoSettings
                     );
                     // Execute init commands once connected
                     foreach ($this->dumpSettings['init_commands'] as $stmt) {
@@ -303,8 +303,8 @@ 
             }
         } catch (PDOException $e) {
             throw new Exception(
-              "Connection to ".$this->dbType." failed with message: ".
-              $e->getMessage()
+                "Connection to ".$this->dbType." failed with message: ".
+                $e->getMessage()
             );
         }
 
@@ -340,16 +340,16 @@ 
 
         // Store server settings and use sanner defaults to dump
         $this->compressManager->write(
-          $this->typeAdapter->backup_parameters()
+            $this->typeAdapter->backup_parameters()
         );
 
         if ($this->dumpSettings['databases']) {
             $this->compressManager->write(
-              $this->typeAdapter->getDatabaseHeader($this->dbName)
+                $this->typeAdapter->getDatabaseHeader($this->dbName)
             );
             if ($this->dumpSettings['add-drop-database']) {
                 $this->compressManager->write(
-                  $this->typeAdapter->add_drop_database($this->dbName)
+                    $this->typeAdapter->add_drop_database($this->dbName)
                 );
             }
         }
@@ -364,7 +364,7 @@ 
 
         if ($this->dumpSettings['databases']) {
             $this->compressManager->write(
-              $this->typeAdapter->databases($this->dbName)
+                $this->typeAdapter->databases($this->dbName)
             );
         }
 
@@ -385,7 +385,7 @@ 
 
         // Restore saved parameters
         $this->compressManager->write(
-          $this->typeAdapter->restore_parameters()
+            $this->typeAdapter->restore_parameters()
         );
         // Write some stats to output file
         $this->compressManager->write($this->getDumpFileFooter());
@@ -404,9 +404,9 @@ 
         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;
+                "--".PHP_EOL.
+                "-- Host: {$this->host}\tDatabase: {$this->dbName}".PHP_EOL.
+                "-- ------------------------------------------------------".PHP_EOL;
 
             if (!empty($this->version)) {
                 $header .= "-- Server version \t".$this->version.PHP_EOL;
@@ -458,8 +458,8 @@ 
                 if (in_array(current($row), $this->dumpSettings['include-tables'], true)) {
                     $this->tables[] = current($row);
                     $elem = array_search(
-                      current($row),
-                      $this->dumpSettings['include-tables']
+                        current($row),
+                        $this->dumpSettings['include-tables']
                     );
                     unset($this->dumpSettings['include-tables'][$elem]);
                 }
@@ -488,8 +488,8 @@ 
                 if (in_array(current($row), $this->dumpSettings['include-views'], true)) {
                     $this->views[] = current($row);
                     $elem = array_search(
-                      current($row),
-                      $this->dumpSettings['include-views']
+                        current($row),
+                        $this->dumpSettings['include-views']
                     );
                     unset($this->dumpSettings['include-views'][$elem]);
                 }
@@ -672,20 +672,20 @@ 
             $ret = '';
             if (!$this->dumpSettings['skip-comments']) {
                 $ret = "--".PHP_EOL.
-                  "-- Table structure for table `$tableName`".PHP_EOL.
-                  "--".PHP_EOL.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) {
                 $this->compressManager->write($ret);
                 if ($this->dumpSettings['add-drop-table']) {
                     $this->compressManager->write(
-                      $this->typeAdapter->drop_table($tableName)
+                        $this->typeAdapter->drop_table($tableName)
                     );
                 }
                 $r = $this->hookTransformTableName($tableName, $r, TRUE);
                 $this->compressManager->write(
-                  $this->typeAdapter->create_table($r)
+                    $this->typeAdapter->create_table($r)
                 );
                 break;
             }
@@ -705,18 +705,18 @@ 
     {
         $columnTypes = array();
         $columns = $this->dbHandler->query(
-          $this->typeAdapter->show_columns($tableName)
+            $this->typeAdapter->show_columns($tableName)
         );
         $columns->setFetchMode(PDO::FETCH_ASSOC);
 
         foreach ($columns as $key => $col) {
             $types = $this->typeAdapter->parseColumnType($col);
             $columnTypes[$col['Field']] = array(
-              'is_numeric'=> $types['is_numeric'],
-              'is_blob' => $types['is_blob'],
-              'type' => $types['type'],
-              'type_sql' => $col['Type'],
-              'is_virtual' => $types['is_virtual']
+                'is_numeric'=> $types['is_numeric'],
+                'is_blob' => $types['is_blob'],
+                'type' => $types['type'],
+                'type_sql' => $col['Type'],
+                'is_virtual' => $types['is_virtual']
             );
         }
 
@@ -734,8 +734,8 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $ret = "--".PHP_EOL.
-              "-- Stand-In structure for view `${viewName}`".PHP_EOL.
-              "--".PHP_EOL.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);
@@ -744,12 +744,12 @@ 
         foreach ($this->dbHandler->query($stmt) as $r) {
             if ($this->dumpSettings['add-drop-table']) {
                 $this->compressManager->write(
-                  $this->typeAdapter->drop_view($viewName)
+                    $this->typeAdapter->drop_view($viewName)
                 );
             }
 
             $this->compressManager->write(
-              $this->createStandInTable($viewName)
+                $this->createStandInTable($viewName)
             );
             break;
         }
@@ -771,7 +771,7 @@ 
         $ret = implode(PHP_EOL.",", $ret);
 
         $ret = "CREATE TABLE IF NOT EXISTS `$viewName` (".
-          PHP_EOL.$ret.PHP_EOL.");".PHP_EOL;
+            PHP_EOL.$ret.PHP_EOL.");".PHP_EOL;
 
         return $ret;
     }
@@ -787,8 +787,8 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $ret = "--".PHP_EOL.
-              "-- View structure for view `${viewName}`".PHP_EOL.
-              "--".PHP_EOL.PHP_EOL;
+                "-- View structure for view `${viewName}`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
             $this->compressManager->write($ret);
         }
         $stmt = $this->typeAdapter->show_create_view($viewName);
@@ -798,10 +798,10 @@ 
         foreach ($this->dbHandler->query($stmt) as $r) {
             // because we must replace table with view, we should delete it
             $this->compressManager->write(
-              $this->typeAdapter->drop_view($viewName)
+                $this->typeAdapter->drop_view($viewName)
             );
             $this->compressManager->write(
-              $this->typeAdapter->create_view($r)
+                $this->typeAdapter->create_view($r)
             );
             break;
         }
@@ -819,11 +819,11 @@ 
         foreach ($this->dbHandler->query($stmt) as $r) {
             if ($this->dumpSettings['add-drop-trigger']) {
                 $this->compressManager->write(
-                  $this->typeAdapter->add_drop_trigger($triggerName)
+                    $this->typeAdapter->add_drop_trigger($triggerName)
                 );
             }
             $this->compressManager->write(
-              $this->typeAdapter->create_trigger($r)
+                $this->typeAdapter->create_trigger($r)
             );
             return;
         }
@@ -839,14 +839,14 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $ret = "--".PHP_EOL.
-              "-- Dumping routines for database '".$this->dbName."'".PHP_EOL.
-              "--".PHP_EOL.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);
         foreach ($this->dbHandler->query($stmt) as $r) {
             $this->compressManager->write(
-              $this->typeAdapter->create_procedure($r)
+                $this->typeAdapter->create_procedure($r)
             );
             return;
         }
@@ -862,14 +862,14 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $ret = "--".PHP_EOL.
-              "-- Dumping events for database '".$this->dbName."'".PHP_EOL.
-              "--".PHP_EOL.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);
         foreach ($this->dbHandler->query($stmt) as $r) {
             $this->compressManager->write(
-              $this->typeAdapter->create_event($r)
+                $this->typeAdapter->create_event($r)
             );
             return;
         }
@@ -961,10 +961,10 @@ 
         }
 
         return call_user_func_array($this->transformColumnValueCallable, array(
-          $tableName,
-          $colName,
-          $colValue,
-          $row
+            $tableName,
+            $colName,
+            $colValue,
+            $row
         ));
     }
 
@@ -1039,13 +1039,13 @@ 
             if ($onlyOnce || !$this->dumpSettings['extended-insert']) {
                 if ($this->dumpSettings['complete-insert']) {
                     $lineSize += $this->compressManager->write(
-                      "INSERT$ignore INTO `$tableName` (".
-                      implode(", ", $colNames).
-                      ") VALUES (".implode(",", $vals).")"
+                        "INSERT$ignore INTO `$tableName` (".
+                        implode(", ", $colNames).
+                        ") VALUES (".implode(",", $vals).")"
                     );
                 } else {
                     $lineSize += $this->compressManager->write(
-                      "INSERT$ignore INTO `$tableName` VALUES (".implode(",", $vals).")"
+                        "INSERT$ignore INTO `$tableName` VALUES (".implode(",", $vals).")"
                     );
                 }
                 $onlyOnce = false;
@@ -1079,9 +1079,9 @@ 
         if (!$this->dumpSettings['skip-comments']) {
             $tableName = $this->hookTransformTableName($tableName, FALSE, TRUE);
             $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
             );
             $tableName = $this->hookTransformTableName($tableName, FALSE);
         }
@@ -1097,21 +1097,21 @@ 
 
         if ($this->dumpSettings['add-locks']) {
             $this->compressManager->write(
-              $this->typeAdapter->start_add_lock_table($tableName)
+                $this->typeAdapter->start_add_lock_table($tableName)
             );
         }
 
         if ($this->dumpSettings['disable-keys']) {
             $tableName = $this->hookTransformTableName($tableName, FALSE, TRUE);
             $this->compressManager->write(
-              $this->typeAdapter->start_add_disable_keys($tableName)
+                $this->typeAdapter->start_add_disable_keys($tableName)
             );
         }
 
         // Disable autocommit for faster reload
         if ($this->dumpSettings['no-autocommit']) {
             $this->compressManager->write(
-              $this->typeAdapter->start_disable_autocommit()
+                $this->typeAdapter->start_disable_autocommit()
             );
         }
 
@@ -1129,13 +1129,13 @@ 
     {
         if ($this->dumpSettings['disable-keys']) {
             $this->compressManager->write(
-              $this->typeAdapter->end_add_disable_keys($tableName)
+                $this->typeAdapter->end_add_disable_keys($tableName)
             );
         }
 
         if ($this->dumpSettings['add-locks']) {
             $this->compressManager->write(
-              $this->typeAdapter->end_add_lock_table($tableName)
+                $this->typeAdapter->end_add_lock_table($tableName)
             );
         }
 
@@ -1150,7 +1150,7 @@ 
         // Commit to enable autocommit
         if ($this->dumpSettings['no-autocommit']) {
             $this->compressManager->write(
-              $this->typeAdapter->end_disable_autocommit()
+                $this->typeAdapter->end_disable_autocommit()
             );
         }
 
@@ -1214,9 +1214,9 @@ 
 abstract class CompressMethod
 {
     public static $enums = array(
-      "None",
-      "Gzip",
-      "Bzip2"
+        "None",
+        "Gzip",
+        "Bzip2"
     );
 
     /**
@@ -1362,8 +1362,8 @@ 
 abstract class TypeAdapter
 {
     public static $enums = array(
-      "Sqlite",
-      "Mysql"
+        "Sqlite",
+        "Mysql"
     );
 
     /**
@@ -1417,8 +1417,8 @@ 
     public function show_create_table($tableName)
     {
         return "SELECT tbl_name as 'Table', sql as 'Create Table' ".
-          "FROM sqlite_master ".
-          "WHERE type='table' AND tbl_name='$tableName'";
+            "FROM sqlite_master ".
+            "WHERE type='table' AND tbl_name='$tableName'";
     }
 
     /**
@@ -1433,8 +1433,8 @@ 
     public function show_create_view($viewName)
     {
         return "SELECT tbl_name as 'View', sql as 'Create View' ".
-          "FROM sqlite_master ".
-          "WHERE type='view' AND tbl_name='$viewName'";
+            "FROM sqlite_master ".
+            "WHERE type='view' AND tbl_name='$viewName'";
     }
 
     /**
@@ -1626,7 +1626,7 @@ 
 
     // Numerical Mysql types
     public $mysqlTypes = array(
-      'numerical' => array(
+        'numerical' => array(
         'bit',
         'tinyint',
         'smallint',
@@ -1639,8 +1639,8 @@ 
         'float',
         'decimal',
         'numeric'
-      ),
-      'blob' => array(
+        ),
+        'blob' => array(
         'tinyblob',
         'blob',
         'mediumblob',
@@ -1656,7 +1656,7 @@ 
         'multilinestring',
         'multipolygon',
         'geometrycollection',
-      )
+        )
     );
 
     public function databases()
@@ -1675,9 +1675,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;
     }
@@ -1720,10 +1720,10 @@ 
         }
 
         $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;
+            "/*!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;
     }
 
@@ -1739,11 +1739,11 @@ 
         $definerStr = $this->dumpSettings['skip-definer'] ? '' : '/*!50013 \2 */'.PHP_EOL;
 
         if ($viewStmtReplaced = preg_replace(
-          '/^(CREATE(?:\s+ALGORITHM=(?:UNDEFINED|MERGE|TEMPTABLE))?)\s+('
-          .self::DEFINER_RE.'(?:\s+SQL SECURITY DEFINER|INVOKER)?)?\s+(VIEW .+)$/',
-          '/*!50001 \1 */'.PHP_EOL.$definerStr.'/*!50001 \3 */',
-          $viewStmt,
-          1
+            '/^(CREATE(?:\s+ALGORITHM=(?:UNDEFINED|MERGE|TEMPTABLE))?)\s+('
+            .self::DEFINER_RE.'(?:\s+SQL SECURITY DEFINER|INVOKER)?)?\s+(VIEW .+)$/',
+            '/*!50001 \1 */'.PHP_EOL.$definerStr.'/*!50001 \3 */',
+            $viewStmt,
+            1
         )) {
             $viewStmt = $viewStmtReplaced;
         };
@@ -1762,17 +1762,17 @@ 
         $triggerStmt = $row['SQL Original Statement'];
         $definerStr = $this->dumpSettings['skip-definer'] ? '' : '/*!50017 \2*/ ';
         if ($triggerStmtReplaced = preg_replace(
-          '/^(CREATE)\s+('.self::DEFINER_RE.')?\s+(TRIGGER\s.*)$/s',
-          '/*!50003 \1*/ '.$definerStr.'/*!50003 \3 */',
-          $triggerStmt,
-          1
+            '/^(CREATE)\s+('.self::DEFINER_RE.')?\s+(TRIGGER\s.*)$/s',
+            '/*!50003 \1*/ '.$definerStr.'/*!50003 \3 */',
+            $triggerStmt,
+            1
         )) {
             $triggerStmt = $triggerStmtReplaced;
         }
 
         $ret .= "DELIMITER ;;".PHP_EOL.
-          $triggerStmt.";;".PHP_EOL.
-          "DELIMITER ;".PHP_EOL.PHP_EOL;
+            $triggerStmt.";;".PHP_EOL.
+            "DELIMITER ;".PHP_EOL.PHP_EOL;
         return $ret;
     }
 
@@ -1781,18 +1781,18 @@ 
         $ret = "";
         if (!isset($row['Create Procedure'])) {
             throw new Exception("Error getting procedure code, unknown output. ".
-              "Please check 'https://bugs.mysql.com/bug.php?id=14564'");
+                "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;
+            $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;
     }
@@ -1802,7 +1802,7 @@ 
         $ret = "";
         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'");
+                "Please check 'http://stackoverflow.com/questions/10853826/mysql-5-5-create-event-gives-syntax-error'");
         }
         $eventName = $row['Event'];
         $eventStmt = $row['Create Event'];
@@ -1810,35 +1810,35 @@ 
         $definerStr = $this->dumpSettings['skip-definer'] ? '' : '/*!50117 \2*/ ';
 
         if ($eventStmtReplaced = preg_replace(
-          '/^(CREATE)\s+('.self::DEFINER_RE.')?\s+(EVENT .*)$/',
-          '/*!50106 \1*/ '.$definerStr.'/*!50106 \3 */',
-          $eventStmt,
-          1
+            '/^(CREATE)\s+('.self::DEFINER_RE.')?\s+(EVENT .*)$/',
+            '/*!50106 \1*/ '.$definerStr.'/*!50106 \3 */',
+            $eventStmt,
+            1
         )) {
             $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;
+            "/*!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;
 
@@ -1850,8 +1850,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 ".
-          "WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
+            "FROM INFORMATION_SCHEMA.TABLES ".
+            "WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
     }
 
     public function show_views()
@@ -1859,8 +1859,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 ".
-          "WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
+            "FROM INFORMATION_SCHEMA.TABLES ".
+            "WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
     }
 
     public function show_triggers()
@@ -1882,8 +1882,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 ".
-          "WHERE ROUTINE_TYPE='PROCEDURE' AND ROUTINE_SCHEMA='${args[0]}'";
+            "FROM INFORMATION_SCHEMA.ROUTINES ".
+            "WHERE ROUTINE_TYPE='PROCEDURE' AND ROUTINE_SCHEMA='${args[0]}'";
     }
 
     /**
@@ -1897,8 +1897,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 ".
-          "WHERE EVENT_SCHEMA='${args[0]}'";
+            "FROM INFORMATION_SCHEMA.EVENTS ".
+            "WHERE EVENT_SCHEMA='${args[0]}'";
     }
 
     public function setup_transaction()
@@ -1945,7 +1945,7 @@ 
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
         return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;".
-          PHP_EOL;
+            PHP_EOL;
     }
 
     public function end_add_disable_keys()
@@ -1953,7 +1953,7 @@ 
         $this->check_parameters(func_num_args(), $expected_num_args = 1, __METHOD__);
         $args = func_get_args();
         return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;".
-          PHP_EOL;
+            PHP_EOL;
     }
 
     public function start_disable_autocommit()
@@ -1971,7 +1971,7 @@ 
         $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;
+            PHP_EOL.PHP_EOL;
     }
 
     public function add_drop_trigger()
@@ -1993,7 +1993,7 @@ 
         $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;
+            "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;".PHP_EOL;
     }
 
     public function getDatabaseHeader()
@@ -2001,8 +2001,8 @@ 
         $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;
+            "-- Current Database: `${args[0]}`".PHP_EOL.
+            "--".PHP_EOL.PHP_EOL;
     }
 
     /**
@@ -2037,19 +2037,19 @@ 
     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;
+            "/*!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;
+                "/*!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;
+            "/*!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;
     }
@@ -2063,12 +2063,12 @@ 
         }
 
         $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;
+            "/*!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;
     }

Spacing +2 added lines, -2 removed lines

@@ -956,7 +956,7 @@ 
      */
     protected function hookTransformColumnValue($tableName, $colName, $colValue, $row)
     {
-        if (! $this->transformColumnValueCallable) {
+        if (!$this->transformColumnValueCallable) {
             return $colValue;
         }
 
@@ -977,7 +977,7 @@ 
      */
     protected function hookTransformTableName($tableName, $row = FALSE, $reset = FALSE)
     {
-        if (! $this->transformTableNameCallable) {
+        if (!$this->transformTableNameCallable) {
             if ($row) {
                 return $row;
             }