Merge pull request #38 from druidfi/1.1.0-features

1.1.0 features
druidfi · Mar 3, 2024 · df0e3bc · df0e3bc
2 parents 9f2dcf6 + 4725eaa
commit df0e3bc
Showing 1 changed file with 44 additions and 33 deletions.
diff --git a/src/Mysqldump.php b/src/Mysqldump.php
@@ -758,38 +758,40 @@ private function prepareColumnValues(string $tableName, array $row): array
         $columnTypes = $this->tableColumnTypes[$tableName];
 
         if ($this->transformTableRowCallable) {
-            $row = call_user_func($this->transformTableRowCallable, $tableName, $row);
+            $row = ($this->transformTableRowCallable)($tableName, $row);
         }
 
+        $dbHandler = $this->conn;
+        $hexBlobEnabled = $this->settings->isEnabled('hex-blob');
         foreach ($row as $colName => $colValue) {
             if ($this->transformColumnValueCallable) {
-                $colValue = call_user_func($this->transformColumnValueCallable, $tableName, $colName, $colValue, $row);
+                $colValue = ($this->transformColumnValueCallable)($tableName, $colName, $colValue, $row);
             }
 
-            $ret[] = $this->escape($colValue, $columnTypes[$colName]);
-        }
+            if ($colValue === null) {
+                $ret[] = "NULL";
+                continue;
+            }
 
-        return $ret;
-    }
+            $colType = $columnTypes[$colName];
+            if ($hexBlobEnabled && $colType['is_blob']) {
+                if ($colType['type'] == 'bit' || $colValue !== '') {
+                    $ret[] = sprintf('0x%s', $colValue);
+                } else {
+                    $ret[] = "''";
+                }
+                continue;
+            }
 
-    /**
-     * Escape values with quotes when needed.
-     */
-    private function escape(?string $colValue, array $colType)
-    {
-        if (is_null($colValue)) {
-            return 'NULL';
-        } elseif ($this->settings->isEnabled('hex-blob') && $colType['is_blob']) {
-            if ($colType['type'] == 'bit' || !empty($colValue)) {
-                return sprintf('0x%s', $colValue);
-            } else {
-                return "''";
+            if ($colType['is_numeric']) {
+                $ret[] = $colValue;
+                continue;
             }
-        } elseif ($colType['is_numeric']) {
-            return $colValue;
+
+            $ret[] = $dbHandler->quote($colValue);
         }
 
-        return $this->conn->quote($colValue);
+        return $ret;
     }
 
     /**
@@ -837,47 +839,56 @@ private function listValues(string $tableName)
         $ignore = $this->settings->isEnabled('insert-ignore') ? '  IGNORE' : '';
         $count = 0;
 
+        $isInfoCallable = $this->infoCallable && is_callable($this->infoCallable);
+        if ($isInfoCallable) {
+            ($this->infoCallable)('table', ['name' => $tableName, 'completed' => false, 'rowCount' => $count]);
+        }
+
+        $line = '';
         foreach ($resultSet as $row) {
             $count++;
             $values = $this->prepareColumnValues($tableName, $row);
             $valueList = implode(',', $values);
 
             if ($onlyOnce || !$this->settings->isEnabled('extended-insert')) {
                 if ($this->settings->isEnabled('complete-insert') && count($colNames)) {
-                    $lineSize += $this->write(sprintf(
+                    $line .= sprintf(
                         'INSERT%s INTO `%s` (%s) VALUES (%s)',
                         $ignore,
                         $tableName,
                         implode(', ', $colNames),
                         $valueList
-                    ));
-                } else {
-                    $lineSize += $this->write(
-                        sprintf('INSERT%s INTO `%s` VALUES (%s)', $ignore, $tableName, $valueList)
                     );
+                } else {
+                    $line .= sprintf('INSERT%s INTO `%s` VALUES (%s)', $ignore, $tableName, $valueList);
                 }
                 $onlyOnce = false;
             } else {
-                $lineSize += $this->write(sprintf(',(%s)', $valueList));
+                $line .= sprintf(',(%s)', $valueList);
             }
 
-            if (($lineSize > $this->settings->getNetBufferLength())
+            if ((strlen($line) > $this->settings->getNetBufferLength())
                 || !$this->settings->isEnabled('extended-insert')) {
                 $onlyOnce = true;
-                $lineSize = $this->write(';' . PHP_EOL);
+                $this->write($line . ';' . PHP_EOL);
+                $line = '';
+
+                if ($isInfoCallable) {
+                    ($this->infoCallable)('table', ['name' => $tableName, 'completed' => false, 'rowCount' => $count]);
+                }
             }
         }
 
         $resultSet->closeCursor();
 
-        if (!$onlyOnce) {
-            $this->write(';' . PHP_EOL);
+        if ($line !== '') {
+            $this->write($line. ';' . PHP_EOL);
         }
 
         $this->endListValues($tableName, $count);
 
-        if ($this->infoCallable && is_callable($this->infoCallable)) {
-            call_user_func($this->infoCallable, 'table', ['name' => $tableName, 'rowCount' => $count]);
+        if ($isInfoCallable) {
+            ($this->infoCallable)('table', ['name' => $tableName, 'completed' => true, 'rowCount' => $count]);
         }
 
         $this->settings->setCompleteInsert($completeInsertBackup);