fix hhvm bug (mysql column type returns between mysql drivers is not …

…standard)
WPP-Public · Sep 13, 2014 · c5c9c2e · c5c9c2e
1 parent 0dea65e
commit c5c9c2e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/Ifsnop/Mysqldump/Mysqldump.php b/src/Ifsnop/Mysqldump/Mysqldump.php
@@ -526,12 +526,12 @@ private function escape($tableName, $row)
                 $ret[] = "NULL";
             } elseif ($this->dumpSettings['hex-blob'] && $columnTypes[$colName]['is_blob']) {
                 if ($columnTypes[$colName]['type'] == 'bit') {
-                    $ret[] = '0x' . bin2hex(chr($colValue));
+                    $ret[] = "0x${colValue}";
                 } else {
                     if (empty($colValue)) {
                         $ret[] = "''";
                     } else {
-                        $ret[] = '0x' . bin2hex($colValue);
+                        $ret[] = "0x${colValue}";
                     }
                 }
             } elseif ($columnTypes[$colName]['is_numeric']) {
@@ -580,7 +580,20 @@ private function listValues($tableName)
 
         $onlyOnce = true;
         $lineSize = 0;
-        $stmt = "SELECT * FROM `$tableName`";
+        $colStmt = array();
+
+        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']) {
+                $colStmt[] = "HEX(`${colName}`) AS `${colName}`";
+            } else {
+                $colStmt[] = "`${colName}`";
+            }
+        }
+        $colStmt = implode($colStmt, ",");
+        $stmt = "SELECT $colStmt FROM `$tableName`";
+
         if ($this->dumpSettings['where']) {
             $stmt .= " WHERE {$this->dumpSettings['where']}";
         }
@@ -1054,10 +1067,10 @@ public function databases()
             $ret = $this->getDatabaseHeader(); // include headers now
         }
 
-        $ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${args[0]}`".
+        $ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${databaseName}`".
             " /*!40100 DEFAULT CHARACTER SET " . $characterSet .
-            " COLLATE " . $collationDb . "*/;" . PHP_EOL . PHP_EOL .
-            "USE `${args[0]}`;" . PHP_EOL . PHP_EOL;
+            " COLLATE ${collationDb} */;" . PHP_EOL . PHP_EOL .
+            "USE `${databaseName}`;" . PHP_EOL . PHP_EOL;
 
         return $ret;
     }
@@ -1081,7 +1094,7 @@ public function create_table($row)
     {
         $ret = "";
         if (isset($row['Create Table'])) {
-            $ret = $row['Create Table'] . ";" . PHP_EOL . PHP_EOL;
+            $ret .= $row['Create Table'] . ";" . PHP_EOL . PHP_EOL;
         } else {
             throw new Exception("Error getting table code, unknown output");
         }
@@ -1140,7 +1153,7 @@ public function create_trigger($row)
             if ( false === $triggerStmtReplaced ) {
                 $triggerStmtReplaced = $triggerStmt;
             }
-            $ret = "DELIMITER ;;" . PHP_EOL .
+            $ret .= "DELIMITER ;;" . PHP_EOL .
                 $triggerStmtReplaced . "*/;;" . PHP_EOL .
                 "DELIMITER ;" . PHP_EOL . PHP_EOL;
         } else {

diff --git a/tests/original.sql b/tests/original.sql
@@ -97,7 +97,7 @@ CREATE TABLE `test029` (
   `id` int,
   `col` blob NOT NULL
 );
-INSERT INTO `test029` VALUES (1,0x0001020304050607080990919293949596979899);
+INSERT INTO `test029` VALUES (1,0x00010203040506070809909192939495969798A9);
 INSERT INTO `test029` VALUES (2,'');
 
 DROP TABLE IF EXISTS `test033`;

diff --git a/tests/test.php b/tests/test.php
@@ -1,4 +1,9 @@
 <?php
+/*
+for($i=0;$i<128;$i++) {
+    echo "$i>" . bin2hex(chr($i)) . "<" . PHP_EOL;
+}
+*/
 
 error_reporting(E_ALL);