Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SchemaAggregation when renaming tables through non-static method call #1065

Merged
merged 2 commits into from
Dec 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/Properties/SchemaAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private function addUpMethodStatements(array $stmts): void
break;

case 'rename':
$this->renameTable($stmt->expr);
$this->renameTableThroughStaticCall($stmt->expr);
}
}
}
Expand Down Expand Up @@ -359,6 +359,9 @@ private function processColumnUpdates(string $tableName, string $argName, array
break;

case 'rename':
$this->renameTableThroughMethodCall($table, $stmt->expr);
break;

case 'renamecolumn':
if ($secondArg instanceof PhpParser\Node\Scalar\String_) {
$table->renameColumn($columnName, $secondArg->value);
Expand Down Expand Up @@ -405,7 +408,7 @@ private function dropTable(PhpParser\Node\Expr\StaticCall $call): void
unset($this->tables[$tableName]);
}

private function renameTable(PhpParser\Node\Expr\StaticCall $call): void
private function renameTableThroughStaticCall(PhpParser\Node\Expr\StaticCall $call): void
{
if (! isset($call->args[0], $call->args[1])
|| ! $call->getArgs()[0]->value instanceof PhpParser\Node\Scalar\String_
Expand All @@ -417,6 +420,28 @@ private function renameTable(PhpParser\Node\Expr\StaticCall $call): void
$oldTableName = $call->getArgs()[0]->value->value;
$newTableName = $call->getArgs()[1]->value->value;

$this->renameTable($oldTableName, $newTableName);
}

private function renameTableThroughMethodCall(SchemaTable $oldTable, PhpParser\Node\Expr\MethodCall $call): void
{
if (! isset($call->args[0])
|| ! $call->getArgs()[0]->value instanceof PhpParser\Node\Scalar\String_
) {
return;
}

/** @var PhpParser\Node\Scalar\String_ $methodCallArgument */
$methodCallArgument = $call->getArgs()[0]->value;

$oldTableName = $oldTable->name;
$newTableName = $methodCallArgument->value;

$this->renameTable($oldTableName, $newTableName);
}

private function renameTable(string $oldTableName, string $newTableName): void
{
if (! isset($this->tables[$oldTableName])) {
return;
}
Expand Down
14 changes: 14 additions & 0 deletions tests/Unit/MigrationHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,20 @@ public function it_can_handle_use_of_after_method_in_migration(): void
self::assertSame('string', $tables['users']->columns['updated_at']->readableType);
}

/** @test */
public function it_can_handle_alter_table_rename()
{
$migrationHelper = new MigrationHelper($this->parser, [
__DIR__.'/data/rename_migrations',
], $this->fileHelper);

$tables = $migrationHelper->initializeTables();

self::assertCount(1, $tables);
self::assertArrayNotHasKey('users', $tables);
self::assertArrayHasKey('accounts', $tables);
}

/**
* @param array<string, SchemaTable> $tables
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

declare(strict_types=1);

namespace Tests\Unit\RenameMigrations;

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class RenameUsersTable extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('users', static function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name')->nullable();
$table->string('email')->unique();
$table->timestamps();
});

Schema::table('users', function (Blueprint $table) {
$table->rename('accounts');
});
}
}