feat: add support for migrations using Schema::connection (#1151)

larastan · Mar 4, 2022 · ddb1096 · ddb1096
1 parent b7892e2
commit ddb1096
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 38 deletions.
diff --git a/src/Properties/MigrationHelper.php b/src/Properties/MigrationHelper.php
@@ -39,7 +39,7 @@ public function __construct(Parser $parser, array $databaseMigrationPath, FileHe
      */
     public function initializeTables(array $tables = []): array
     {
-        if (empty($this->databaseMigrationPath)) {
+        if (count($this->databaseMigrationPath) === 0) {
             $this->databaseMigrationPath = [database_path('migrations')];
         }
 

diff --git a/src/Properties/SchemaAggregator.php b/src/Properties/SchemaAggregator.php
@@ -62,33 +62,50 @@ private function addUpMethodStatements(array $stmts): void
 
         foreach ($methods as $stmt) {
             if ($stmt instanceof PhpParser\Node\Stmt\Expression
+                && $stmt->expr instanceof PhpParser\Node\Expr\MethodCall
+                && $stmt->expr->var instanceof PhpParser\Node\Expr\StaticCall
+                && $stmt->expr->var->class instanceof PhpParser\Node\Name
+                && $stmt->expr->var->name instanceof PhpParser\Node\Identifier
+                && ($stmt->expr->var->name->toString() === 'connection' || $stmt->expr->var->name->toString() === 'setConnection')
+                && ($stmt->expr->var->class->toCodeString() === '\Illuminate\Support\Facades\Schema' || $stmt->expr->var->class->toCodeString() === '\Schema')
+            ) {
+                $statement = $stmt->expr;
+            } elseif ($stmt instanceof PhpParser\Node\Stmt\Expression
                 && $stmt->expr instanceof PhpParser\Node\Expr\StaticCall
-                && ($stmt->expr->class instanceof PhpParser\Node\Name)
+                && $stmt->expr->class instanceof PhpParser\Node\Name
                 && $stmt->expr->name instanceof PhpParser\Node\Identifier
                 && ($stmt->expr->class->toCodeString() === '\Illuminate\Support\Facades\Schema' || $stmt->expr->class->toCodeString() === '\Schema')
             ) {
-                switch ($stmt->expr->name->name) {
-                    case 'create':
-                        $this->alterTable($stmt->expr, true);
-                        break;
-
-                    case 'table':
-                        $this->alterTable($stmt->expr, false);
-                        break;
-
-                    case 'drop':
-                    case 'dropIfExists':
-                        $this->dropTable($stmt->expr);
-                        break;
-
-                    case 'rename':
-                        $this->renameTableThroughStaticCall($stmt->expr);
-                }
+                $statement = $stmt->expr;
+            } else {
+                continue;
+            }
+
+            if (! $statement->name instanceof PhpParser\Node\Identifier) {
+                continue;
+            }
+
+            switch ($statement->name->name) {
+                case 'create':
+                    $this->alterTable($statement, true);
+                    break;
+
+                case 'table':
+                    $this->alterTable($statement, false);
+                    break;
+
+                case 'drop':
+                case 'dropIfExists':
+                    $this->dropTable($statement);
+                    break;
+
+                case 'rename':
+                    $this->renameTableThroughStaticCall($statement);
             }
         }
     }
 
-    private function alterTable(PhpParser\Node\Expr\StaticCall $call, bool $creating): void
+    private function alterTable(PhpParser\Node\Expr\StaticCall|PhpParser\Node\Expr\MethodCall $call, bool $creating): void
     {
         if (! isset($call->args[0])
             || ! $call->getArgs()[0]->value instanceof PhpParser\Node\Scalar\String_
@@ -401,7 +418,7 @@ private function processColumnUpdates(string $tableName, string $argName, array
         }
     }
 
-    private function dropTable(PhpParser\Node\Expr\StaticCall $call): void
+    private function dropTable(PhpParser\Node\Expr\StaticCall|PhpParser\Node\Expr\MethodCall $call): void
     {
         if (! isset($call->args[0])
             || ! $call->getArgs()[0]->value instanceof PhpParser\Node\Scalar\String_
@@ -414,7 +431,7 @@ private function dropTable(PhpParser\Node\Expr\StaticCall $call): void
         unset($this->tables[$tableName]);
     }
 
-    private function renameTableThroughStaticCall(PhpParser\Node\Expr\StaticCall $call): void
+    private function renameTableThroughStaticCall(PhpParser\Node\Expr\StaticCall|PhpParser\Node\Expr\MethodCall $call): void
     {
         if (! isset($call->args[0], $call->args[1])
             || ! $call->getArgs()[0]->value instanceof PhpParser\Node\Scalar\String_

diff --git a/tests/Unit/MigrationHelperTest.php b/tests/Unit/MigrationHelperTest.php
@@ -120,22 +120,6 @@ public function it_can_handle_alter_table_rename()
         self::assertArrayHasKey('accounts', $tables);
     }
 
-    /**
-     * @param  array<string, SchemaTable>  $tables
-     */
-    private function assertUsersTableSchema(array $tables): void
-    {
-        self::assertCount(1, $tables);
-        self::assertArrayHasKey('users', $tables);
-        self::assertCount(5, $tables['users']->columns);
-        self::assertSame(['id', 'name', 'email', 'created_at', 'updated_at'], array_keys($tables['users']->columns));
-        self::assertSame('int', $tables['users']->columns['id']->readableType);
-        self::assertSame('string', $tables['users']->columns['name']->readableType);
-        self::assertSame('string', $tables['users']->columns['email']->readableType);
-        self::assertSame('string', $tables['users']->columns['created_at']->readableType);
-        self::assertSame('string', $tables['users']->columns['updated_at']->readableType);
-    }
-
     /** @test */
     public function it_can_handle_migrations_with_soft_deletes()
     {
@@ -161,4 +145,30 @@ public function it_can_handle_migrations_with_soft_deletes_tz()
         self::assertCount(6, $tables['users']->columns);
         self::assertSame('string', $tables['users']->columns['deleted_at']->readableType);
     }
+
+    /** @test */
+    public function it_can_handle_connection_before_schema_create()
+    {
+        $migrationHelper = new MigrationHelper($this->parser, [__DIR__.'/data/migration_with_schema_connection'], $this->fileHelper);
+
+        $tables = $migrationHelper->initializeTables();
+
+        $this->assertUsersTableSchema($tables);
+    }
+
+    /**
+     * @param  array<string, SchemaTable>  $tables
+     */
+    private function assertUsersTableSchema(array $tables): void
+    {
+        self::assertCount(1, $tables);
+        self::assertArrayHasKey('users', $tables);
+        self::assertCount(5, $tables['users']->columns);
+        self::assertSame(['id', 'name', 'email', 'created_at', 'updated_at'], array_keys($tables['users']->columns));
+        self::assertSame('int', $tables['users']->columns['id']->readableType);
+        self::assertSame('string', $tables['users']->columns['name']->readableType);
+        self::assertSame('string', $tables['users']->columns['email']->readableType);
+        self::assertSame('string', $tables['users']->columns['created_at']->readableType);
+        self::assertSame('string', $tables['users']->columns['updated_at']->readableType);
+    }
 }
diff --git a/tests/Unit/data/migration_with_schema_connection/2020_01_30_000000_create_users_table.php b/tests/Unit/data/migration_with_schema_connection/2020_01_30_000000_create_users_table.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\MigrationWithSchemaConnection;
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUsersTable extends Migration
+{
+    public function up(): void
+    {
+        Schema::connection('foo')->create('users', static function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name')->nullable();
+            $table->string('email')->unique();
+            $table->timestamps();
+        });
+    }
+}