Add the exclude-stripped-tables put option

README.md

@@ -68,12 +68,14 @@ There are some advanced configuration options that you may be interested in, suc
 
 ### Upload a database backup
 
-    magedbm2 put [--strip="@development"] [--clean=NUM|--no-clean] <project>
+    magedbm2 put [--strip="@development"] [--exclude-stripped-tables] [--clean=NUM|--no-clean] <project>
 
 The `put` command will create a database backup and upload it to S3. If no database parameters are passed through on the command line, Magento will be assumed, and the database details will attempted to be loaded from the current working directory, or the directory specified by `--root-dir`.
 
 By default, the tables defined in the `@development` table group (which can be seen by running `magedbm2 put --help`) will be stripped. Additional tables or table groups can be added to the `--strip` option, separated by spaces, e.g. `--strip="@log @sessions customtable customprefix*"`.
 
+By default, the `--strip` option creates empty tables with no data for the stripped tables, to exclude those tables entirely use the option `--exclude-stripped-tables`
+
 The `put` command also automatically cleans up old database backups once a new one has been uploaded, keeping only the 5 most recent backup files. You can customise the number of retained backups with the `--clean` option, or disable it completely with `--no-clean`.
 
 ### List available backup files

src/Application/Config/Option.php

@@ -28,6 +28,7 @@ final class Option
     const FORCE = 'force';
     const DOWNLOAD_ONLY = 'download-only';
     const STRIP = 'strip';
+    const EXCLUDE_STRIPPED_TABLES = 'exclude-stripped-tables';
 
     const CLEAN_COUNT = 'clean';
     const NO_CLEAN = 'no-clean';

src/Command/PutCommand.php

@@ -91,6 +91,12 @@ protected function configure()
                     "customer data is stripped.",
                 "@development"
             )
+            ->addOption(
+                Option::EXCLUDE_STRIPPED_TABLES,
+                "S",
+                InputOption::VALUE_NONE,
+                "Do not include structure for the stripped tables."
+            )
             ->addOption(
                 Option::CLEAN_COUNT,
                 "c",
@@ -123,6 +129,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $project = $input->getArgument(self::ARG_PROJECT);
         $strip_tables = $input->getOption(Option::STRIP) ?? '@development';
+        $exclude_stripped_tables = $input->getOption(Option::EXCLUDE_STRIPPED_TABLES);
 
         $output->writeln(
             "<info>Creating a backup file of the database...</info>",
@@ -132,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $this->database->setLogger($this->getLogger());
 
-            $local_file = $this->database->dump($project, $this->tableExpander->expand($strip_tables));
+            $local_file = $this->database->dump($project, $this->tableExpander->expand($strip_tables), $exclude_stripped_tables);
 
             if (!file_exists($local_file)) {
                 throw new ServiceException(sprintf(

src/Service/Database/Shell.php

@@ -98,12 +98,13 @@ public function import($file)
      *
      * @param string $identifier An identifier for the dump file.
      * @param string $strip_tables_patterns List of table patterns to dump with no data.
+     * @param bool $exclude_stripped_tables If strip tables is set, define if empty tables are excluded from the dump
      *
      * @return string Path to the database dump.
      * @throws \Symfony\Component\Process\Exception\LogicException
      * @throws \Symfony\Component\Process\Exception\RuntimeException
      */
-    public function dump($identifier, $strip_tables_patterns = '')
+    public function dump($identifier, $strip_tables_patterns = '', $exclude_stripped_tables = false)
     {
         $stripTables = array_filter($this->getStripTables($strip_tables_patterns));
 
@@ -118,7 +119,7 @@ public function dump($identifier, $strip_tables_patterns = '')
         /** @var Process[] $commands */
         $commands = [];
 
-        if (count($stripTables) > 0) {
+        if (count($stripTables) > 0 && !$exclude_stripped_tables) {
             // Create the structure-only dump for tables that we don't want the data from.
             $commands[] = $this->createDumpProcess()
                 ->argument('--no-data')