Prepare 5.0.1 release.

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Apr 3, 2020 · 78a02e8 · 78a02e8
1 parent 9f4e3d4
commit 78a02e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG-5.x.md b/CHANGELOG-5.x.md
@@ -6,6 +6,10 @@ This changelog references the relevant changes (bug and security fixes) done to
 
 Released: 2020-04-03
 
+### Changes
+
+* Throw exception when trying to make migration file without `--table` option on shared database configuration.
+
 ### Fixes
 
 * Fixes migration stub files.

diff --git a/src/Console/MigrateMakeCommand.php b/src/Console/MigrateMakeCommand.php
@@ -3,7 +3,6 @@
 namespace Orchestra\Tenanti\Console;
 
 use Illuminate\Support\Composer;
-use InvalidArgumentException;
 use Orchestra\Tenanti\Migrator\MigrationWriter;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -41,9 +40,7 @@ public function handle(Composer $composer)
         $create = $this->input->getOption('create') ?? false;
         $table = $this->input->getOption('table');
 
-        if (\is_bool($create) && empty($table)) {
-            throw new InvalidArgumentException('Please set the table name for this migration using --table option!');
-        } elseif (! $table && \is_string($create)) {
+        if (! $table && \is_string($create)) {
             $table = $create;
         }
 

diff --git a/src/Migrator/MigrationWriter.php b/src/Migrator/MigrationWriter.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Migrations\MigrationCreator;
 use Illuminate\Filesystem\Filesystem;
+use InvalidArgumentException;
 use Orchestra\Support\Str;
 use Orchestra\Tenanti\TenantiManager;
 
@@ -42,6 +43,10 @@ public function __invoke(
         }
 
         if ($this->tenant->config("{$driver}.shared", true) === true) {
+            if (empty($table)) {
+                throw new InvalidArgumentException('Require table name for shared database migration!');
+            }
+
             $table = Str::replace($migrator->tablePrefix()."_{$table}", ['id' => '{$id}']);
         }