Backupdb: Fix when last insertion to a table is ephemeral.

kohler · Sep 22, 2023 · f313c14 · f313c14
1 parent e826a26
commit f313c14
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/batch/backupdb.php b/batch/backupdb.php
@@ -522,8 +522,9 @@ private function process_line($s, $line) {
                     ++$p;
                 }
                 if ($p === $l) {
-                    break;
-                } else if ($ch === "(") {
+                    $ch = "";
+                }
+                if ($ch === "(") {
                     if (!preg_match('/\G\((?:[^\\\\\')]|\'(?:[^\\\\\']|\\\\.)*+\')*+\)/s', $s, $m, 0, $p)) {
                         break;
                     }
@@ -541,10 +542,12 @@ private function process_line($s, $line) {
                     }
                     ++$p;
                     continue;
-                } else if ($ch === ";") {
-                    if ($this->_separator === "") {
-                        $this->fwrite(";");
-                    }
+                }
+                if ($this->_separator === "" || $this->_separator === ",\n") {
+                    // have inserted
+                    $this->fwrite($ch === ";" ? ";" : ";\n");
+                }
+                if ($ch === ";") {
                     ++$p;
                 }
                 $this->_inserting = null;