Merge pull request #23 from meanbee/19-dump-always-drop-tables

Always drop tables when creating database export.
meanbee · Dec 18, 2015 · 8d66951 · 8d66951
2 parents 3623ba5 + df40271
commit 8d66951
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Meanbee/Magedbm/Command/GetCommand.php b/src/Meanbee/Magedbm/Command/GetCommand.php
@@ -50,7 +50,7 @@ protected function configure()
                 '--drop-tables',
                 '-d',
                 InputOption::VALUE_NONE,
-                'Drop tables before import'
+                'Drop tables before import.  Deprecated since 1.4.0 as all exports now drop tables automatically.'
             )
             ->addOption(
                 '--region',
@@ -198,10 +198,6 @@ protected function backupImport($file, $input)
             '--compression' => 'gzip',
         );
 
-        if ($input->getOption('drop-tables')) {
-            $params['--drop-tables'] = true;
-        }
-
         try {
             if ($returnCode = $importCommand->run(new ArrayInput($params), $this->getOutput())) {
                 $this->getOutput()->writeln('<error>magerun db:import failed to import database.</error>');

diff --git a/src/Meanbee/Magedbm/Command/PutCommand.php b/src/Meanbee/Magedbm/Command/PutCommand.php
@@ -291,13 +291,15 @@ private function createBackupWithoutExec(InputInterface $input, OutputInterface
                 array(
                     'include-tables' => $stripTables,
                     'no-data' => true,
+                    'add-drop-table' => true,
                 )
             );
 
             $dumpStructure->start($filePath . '.structure');
 
             $dump = new Mysqldump(sprintf('%s;dbname=%s', $dbHelper->dsn(), $dbName), $username, $password, array(
-                'exclude-tables' => $stripTables
+                'exclude-tables' => $stripTables,
+                'add-drop-table' => true,
             ));
 
             $dump->start($filePath . '.data');