Page MenuHomePhabricator
Files F14757267

D18707.diff
No OneTemporary
Actions

D18707.diff
View Options

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -215,7 +215,10 @@
$target['table']);
}
- $commands[] = $command;
+ $commands[] = array(
+ 'command' => $command,
+ 'database' => $target['database'],
+ );
}
@@ -244,9 +247,26 @@
$file));
}
+ $created = array();
+
try {
- foreach ($commands as $command) {
- $future = new ExecFuture('%C', $command);
+ foreach ($commands as $spec) {
+ // Because we're dumping database-by-database, we need to generate our
+ // own CREATE DATABASE and USE statements.
+
+ $database = $spec['database'];
+ $preamble = array();
+ if (!isset($created[$database])) {
+ $preamble[] =
+ "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$database}` ".
+ "/*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin */;\n";
+ $created[$database] = true;
+ }
+ $preamble[] = "USE `{$database}`;\n";
+ $preamble = implode('', $preamble);
+ $this->writeData($preamble, $file, $is_compress, $output_file);
+
+ $future = new ExecFuture('%C', $spec['command']);
$iterator = id(new FutureIterator(array($future)))
->setUpdateInterval(0.100);
@@ -258,23 +278,7 @@
fwrite(STDERR, $stderr);
}
- if (strlen($stdout)) {
- if (!$file) {
- $ok = fwrite(STDOUT, $stdout);
- } else if ($is_compress) {
- $ok = gzwrite($file, $stdout);
- } else {
- $ok = fwrite($file, $stdout);
- }
-
- if ($ok !== strlen($stdout)) {
- throw new Exception(
- pht(
- 'Failed to write %d byte(s) to file "%s".',
- new PhutilNumber(strlen($stdout)),
- $output_file));
- }
- }
+ $this->writeData($stdout, $file, $is_compress, $output_file);
if ($ready !== null) {
$ready->resolvex();
@@ -314,4 +318,27 @@
return 0;
}
+
+ private function writeData($data, $file, $is_compress, $output_file) {
+ if (!strlen($data)) {
+ return;
+ }
+
+ if (!$file) {
+ $ok = fwrite(STDOUT, $data);
+ } else if ($is_compress) {
+ $ok = gzwrite($file, $data);
+ } else {
+ $ok = fwrite($file, $data);
+ }
+
+ if ($ok !== strlen($data)) {
+ throw new Exception(
+ pht(
+ 'Failed to write %d byte(s) to file "%s".',
+ new PhutilNumber(strlen($data)),
+ $output_file));
+ }
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 11:52 PM (5 h, 31 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7035674
Default Alt Text
D18707.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility