allow to work on only some dbs at a time

Author: Gaetano Giunta

app/src/Command/DatabaseCreate.php

@@ -39,7 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->setOutput($output);
         $this->setVerbosity($output->getVerbosity());
 
-        $dbList = $this->dbManager->listInstances();
+        $dbList = $this->dbManager->listInstances($input->getOption('only-instances'), $input->getOption('except-instances'));
         $userName = $input->getOption('user');
         $password = $input->getOption('password');
         $dbName = $input->getOption('database');

app/src/Command/DatabaseDrop.php

@@ -38,7 +38,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->setOutput($output);
         $this->setVerbosity($output->getVerbosity());
 
-        $dbList = $this->dbManager->listInstances();
+        $dbList = $this->dbManager->listInstances($input->getOption('only-instances'), $input->getOption('except-instances'));
         $userName = $input->getOption('user');
         $dbName = $input->getOption('database');
 

app/src/Command/DatabaseList.php

@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->setOutput($output);
         $this->setVerbosity($output->getVerbosity());
 
-        $dbList = $this->dbManager->listInstances();
+        $dbList = $this->dbManager->listInstances($input->getOption('only-instances'), $input->getOption('except-instances'));
 
         $timeout = $input->getOption('timeout');
         $maxParallel = $input->getOption('max-parallel');
@@ -54,22 +54,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->writeln('<info>Analyzing databases...</info>', OutputInterface::VERBOSITY_VERBOSE);
         }
 
-        $results = $this->listInstances($dbList, $maxParallel, $timeout, $format);
+        $results = $this->listDatabases($dbList, $maxParallel, $timeout, $format);
 
         $time = microtime(true) - $start;
 
         $this->writeResults($results, $time, $format);
     }
 
-    protected function listInstances($dbList, $maxParallel, $timeout, $format = self::DEFAULT_OUTPUT_FORMAT)
+    protected function listDatabases($dbList, $maxParallel, $timeout, $format = self::DEFAULT_OUTPUT_FORMAT)
     {
         $processes = [];
 
         foreach ($dbList as $dbName) {
             $rootDbConnectionSpec = $this->dbManager->getDatabaseConnectionSpecification($dbName);
 
             $schemaManager = new DatabaseSchemaManager($rootDbConnectionSpec);
-            $sql = $schemaManager->getListInstancesSQL();
+            $sql = $schemaManager->getListDatabasesSQL();
 
             $executor = $this->executorFactory->createForkedExecutor($rootDbConnectionSpec, 'NativeClient', false);
             $process = $executor->getExecuteCommandProcess($sql);

app/src/Command/DatabaseManagingCommand.php

@@ -41,7 +41,8 @@ protected function addCommonOptions()
             ->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'The maximum time to wait for execution (secs)', self::DEFAULT_PROCESS_TIMEOUT)
             ->addOption('max-parallel', null, InputOption::VALUE_REQUIRED, 'The maximum number of processes to run in parallel', self::DEFAULT_PARALLEL_PROCESSES)
             ->addOption('dont-force-enabled-sigchild', null, InputOption::VALUE_NONE, "When using a separate php process to run each sql command, do not force Symfony to believe that php was compiled with --enable-sigchild option")
-            ->addOption('instances', null, InputOption::VALUE_REQUIRED, 'Filter the database servers to run this command against. Usage of * and ? wildcards is allowed. To see all instances available, use `db3v4l:instance:list`', null)
+            ->addOption('only-instances', null, InputOption::VALUE_REQUIRED, 'Filter the database servers to run this command against. Usage of * and ? wildcards is allowed. To see all instances available, use `db3v4l:instance:list`', null)
+            ->addOption('except-instances', null, InputOption::VALUE_REQUIRED, 'Filter the database servers to run this command against.', null)
         ;
     }
 
@@ -215,5 +216,4 @@ protected function writeResults(array $results, $time, $format = 'text')
             $this->writeln("<info>Time taken: ".sprintf('%.2f', $time)." secs</info>");
         }
     }
-
 }

app/src/Command/SqlExecute.php

@@ -39,7 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->setOutput($output);
         $this->setVerbosity($output->getVerbosity());
 
-        $dbList = $this->dbManager->listInstances();
+        $dbList = $this->dbManager->listInstances($input->getOption('only-instances'), $input->getOption('except-instances'));
         $sql = $input->getOption('sql');
         $file = $input->getOption('file');
         $timeout = $input->getOption('timeout');

app/src/Command/UserList.php

@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->setOutput($output);
         $this->setVerbosity($output->getVerbosity());
 
-        $dbList = $this->dbManager->listInstances();
+        $dbList = $this->dbManager->listInstances($input->getOption('only-instances'), $input->getOption('except-instances'));
 
         $timeout = $input->getOption('timeout');
         $maxParallel = $input->getOption('max-parallel');

app/src/Core/DatabaseSchemaManager.php

@@ -94,7 +94,7 @@ public function getDropDatabaseQL($userName, $dbName = null)
     /**
      * @return string
      */
-    public function getListInstancesSQL()
+    public function getListDatabasesSQL()
     {
         $dbType = $this->getDbTypeFromDriver($this->databaseConfiguration['driver']);
 

app/src/Service/DatabaseConfigurationManager.php

@@ -12,11 +12,18 @@ public function __construct(array $instanceList)
     }
 
     /**
+     * @param string $includeFilter accepts 'glob' wildcards
+     * @param string $excludeFilter accepts 'glob' wildcards
      * @return string[]
      */
-    public function listInstances()
+    public function listInstances($includeFilter = null, $excludeFilter = null)
     {
-        return array_keys($this->instanceList);
+        $names = [];
+        foreach(array_keys($this->instanceList) as $name) {
+            if (($includeFilter == '' || fnmatch($includeFilter, $name)) && ($excludeFilter == '' || !fnmatch($includeFilter, $name)))
+                $names[] = $name;
+        }
+        return $names;
     }
 
     /**