Merge pull request #98 from kitloong/feature/connection

Generate connection name if --connection is specified

Author: kitloong

src/MigrateGenerateCommand.php

@@ -81,7 +81,7 @@ public function handle(): void
     {
         $previousConnection = DB::getDefaultConnection();
         try {
-            $this->setup();
+            $this->setup($previousConnection);
 
             $connection = $this->option('connection') ?: $previousConnection;
 
@@ -116,10 +116,13 @@ public function handle(): void
     /**
      * Setup by setting configuration + command options into Setting.
      * Setting is a singleton and will be used as generator configuration.
+     *
+     * @param  string  $connection  The default DB connection name.
      */
-    protected function setup(): void
+    protected function setup(string $connection): void
     {
         $setting = app(Setting::class);
+        $setting->setDefaultConnection($connection);
         $setting->setUseDBCollation($this->option('use-db-collation'));
         $setting->setIgnoreIndexNames($this->option('default-index-names'));
         $setting->setIgnoreForeignKeyNames($this->option('default-fk-names'));

src/Migration/Blueprint/SchemaBlueprint.php

@@ -2,9 +2,9 @@
 
 namespace KitLoong\MigrationsGenerator\Migration\Blueprint;
 
-use Illuminate\Support\Facades\Config;
 use KitLoong\MigrationsGenerator\Enum\Migrations\Method\SchemaBuilder;
 use KitLoong\MigrationsGenerator\Migration\Enum\Space;
+use KitLoong\MigrationsGenerator\Setting;
 use KitLoong\MigrationsGenerator\Support\TableName;
 
 class SchemaBlueprint implements WritableBlueprint
@@ -56,8 +56,10 @@ public function toString(): string
      */
     private function getLines(): array
     {
+        $setting = app(Setting::class);
+
         $schema = "Schema::$this->schemaBuilder";
-        if ($this->connection !== Config::get('database.default')) {
+        if ($this->connection !== $setting->getDefaultConnection()) {
             $schema = "Schema::" . SchemaBuilder::CONNECTION() . "('$this->connection')->$this->schemaBuilder";
         }
 

src/Setting.php

@@ -6,6 +6,14 @@
 
 class Setting
 {
+    /**
+     * The default DB connection name, also known as "previous" connection name if migration is called
+     * with `--connection=other` option.
+     *
+     * @var string
+     */
+    private $defaultConnection;
+
     /** @var boolean */
     private $useDBCollation;
 
@@ -36,6 +44,22 @@ class Setting
     /** @var string */
     private $fkFilename;
 
+    /**
+     * @return string
+     */
+    public function getDefaultConnection(): string
+    {
+        return $this->defaultConnection;
+    }
+
+    /**
+     * @param  string  $defaultConnection
+     */
+    public function setDefaultConnection(string $defaultConnection): void
+    {
+        $this->defaultConnection = $defaultConnection;
+    }
+
     /**
      * @return bool
      */

tests/Feature/MySQL57/DBConnectionTest.php

@@ -3,6 +3,7 @@
 namespace KitLoong\MigrationsGenerator\Tests\Feature\MySQL57;
 
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Schema;
 use PDO;
 
@@ -80,6 +81,11 @@ public function testDBConnection()
         };
 
         $this->verify($migrateTemplates, $generateMigrations);
+
+        $this->assertStringContainsString(
+            'Schema::connection',
+            File::files($this->storageMigrations())[0]->getContents()
+        );
     }
 
     public function testLogMigrationToAnotherSource()

tests/MigrationWriterTest.php

@@ -2,11 +2,13 @@
 
 namespace KitLoong\MigrationsGenerator\Tests;
 
+use Illuminate\Support\Facades\DB;
 use KitLoong\MigrationsGenerator\Enum\Migrations\Method\SchemaBuilder;
 use KitLoong\MigrationsGenerator\Migration\Blueprint\SchemaBlueprint;
 use KitLoong\MigrationsGenerator\Migration\Blueprint\TableBlueprint;
 use KitLoong\MigrationsGenerator\Migration\Enum\MigrationFileType;
 use KitLoong\MigrationsGenerator\Migration\Writer\MigrationWriter;
+use KitLoong\MigrationsGenerator\Setting;
 use KitLoong\MigrationsGenerator\Support\TableName;
 use Mockery\MockInterface;
 
@@ -17,6 +19,9 @@ class MigrationWriterTest extends TestCase
      */
     public function testWrite()
     {
+        $setting = app(Setting::class);
+        $setting->setDefaultConnection(DB::getDefaultConnection());
+
         $this->mock(TableName::class, function (MockInterface $mock) {
             $mock->shouldReceive('stripPrefix')
                 ->andReturn('test');