Fixed #2274

craftcms · Jan 5, 2018 · 7e32413 · 7e32413
1 parent da7faf2
commit 7e32413
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -7,6 +7,7 @@
 
 ### Fixed
 - Fixed the position of asset folder toggles. ([#2264](https://github.com/craftcms/cms/issues/2264))
+- Fixed a bug where default Craft database backups and restores would fail if there was a space in the file path. ([#2274](https://github.com/craftcms/cms/issues/2274))
 
 ## 3.0.0-RC4 - 2018-01-02
 

diff --git a/src/db/mysql/Schema.php b/src/db/mysql/Schema.php
@@ -153,7 +153,7 @@ public function getDefaultBackupCommand(): string
         }
 
         $defaultArgs =
-            ' --defaults-extra-file='.$this->_createDumpConfigFile().
+            ' --defaults-extra-file="'.$this->_createDumpConfigFile().'"'.
             ' --add-drop-table'.
             ' --comments'.
             ' --create-options'.
@@ -167,15 +167,15 @@ public function getDefaultBackupCommand(): string
             $defaultArgs.
             ' --single-transaction'.
             ' --no-data'.
-            ' --result-file={file}'.
+            ' --result-file="{file}"'.
             ' {database}';
 
         $dataDump = 'mysqldump'.
             $defaultArgs.
             ' --no-create-info'.
             implode('', $defaultTableIgnoreList).
             ' {database}'.
-            ' >> {file}';
+            ' >> "{file}"';
 
         return $schemaDump.' && '.$dataDump;
     }
@@ -188,9 +188,9 @@ public function getDefaultBackupCommand(): string
     public function getDefaultRestoreCommand(): string
     {
         return 'mysqldump'.
-            ' --defaults-extra-file='.$this->_createDumpConfigFile().
+            ' --defaults-extra-file="'.$this->_createDumpConfigFile().'"'.
             ' {database}'.
-            ' < {file}';
+            ' < "{file}"';
     }
 
     /**

diff --git a/src/db/pgsql/Schema.php b/src/db/pgsql/Schema.php
@@ -153,7 +153,7 @@ public function getDefaultBackupCommand()
             ' --username={user}'.
             ' --if-exists'.
             ' --clean'.
-            ' --file={file}'.
+            ' --file="{file}"'.
             ' --schema={schema}'.
             implode('', $defaultTableIgnoreList);
     }
@@ -171,7 +171,7 @@ public function getDefaultRestoreCommand(): string
             ' --port={port}'.
             ' --username={user}'.
             ' --no-password'.
-            ' < {file}';
+            ' < "{file}"';
     }
 
     /**