Merge pull request #896 from cinamo/master

Unset parameters for sharded databases as well
doctrine · Dec 11, 2018 · 5c13e81 · 5c13e81
2 parents 0d045ec + 4b57635
commit 5c13e81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -63,13 +63,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $shards = $params['shards'];
             // Default select global
             $params = array_merge($params, $params['global']);
-            unset($params['global']['dbname']);
+            unset($params['global']['dbname'], $params['global']['path'], $params['global']['url']);
             if ($input->getOption('shard')) {
                 foreach ($shards as $i => $shard) {
                     if ($shard['id'] === (int) $input->getOption('shard')) {
                         // Select sharded database
                         $params = array_merge($params, $shard);
-                        unset($params['shards'][$i]['dbname'], $params['id']);
+                        unset($params['shards'][$i]['dbname'], $params['shards'][$i]['path'], $params['shards'][$i]['url'], $params['id']);
                         break;
                     }
                 }

diff --git a/Tests/Command/CreateDatabaseDoctrineTest.php b/Tests/Command/CreateDatabaseDoctrineTest.php
@@ -51,6 +51,7 @@ public function testExecuteWithShardOption()
             'global' => [
                 'driver' => 'pdo_sqlite',
                 'dbname' => 'test',
+                'path' => sys_get_temp_dir() . '/global',
             ],
             'shards' => [
                 'foo' => [