-
Notifications
You must be signed in to change notification settings - Fork 11k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix migrations $connection property (#41161)
Despite being documented as allowing `Schema` queries to run on the given secondary connection, `Schema::connection()` must also be explicitly called to avoid `up()` and `down()` queries to be run on the default database connection. Instead this property is only used by the migrator when wrapping `DB::transaction()` & `DB::pretend()`. The queries still run on the default database connection (or the command option --database.) This change makes queries run using that $connection while not affecting the migrations repository. i.e., the connection for the `migrations` history table. If another `Schema::connection()` is called during `up()` or `down()`, that will be used instead of `$connection`. $connection also overrides MigrateCommand option '--database'. A breaking change is required to switch to the opposite behavior.
- Loading branch information
Showing
4 changed files
with
157 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
.../Database/migrations/connection_configured/2022_02_21_000000_create_failed_jobs_table.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?php | ||
|
|
||
| use Illuminate\Database\Migrations\Migration; | ||
| use Illuminate\Database\Schema\Blueprint; | ||
| use Illuminate\Support\Facades\Schema; | ||
|
|
||
| return new class extends Migration | ||
| { | ||
| /** | ||
| * The database connection that should be used by the migration. | ||
| * | ||
| * @var string | ||
| */ | ||
| protected $connection = 'sqlite3'; | ||
|
|
||
| /** | ||
| * Run the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function up() | ||
| { | ||
| Schema::create('failed_jobs', function (Blueprint $table) { | ||
| $table->id(); | ||
| $table->text('connection'); | ||
| $table->text('queue'); | ||
| $table->longText('payload'); | ||
| $table->longText('exception'); | ||
| $table->timestamp('failed_at')->useCurrent(); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Reverse the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function down() | ||
| { | ||
| Schema::dropIfExists('failed_jobs'); | ||
| } | ||
| }; |
36 changes: 36 additions & 0 deletions
36
tests/Database/migrations/connection_configured/2022_02_21_120000_create_jobs_table.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?php | ||
|
|
||
| use Illuminate\Database\Migrations\Migration; | ||
| use Illuminate\Database\Schema\Blueprint; | ||
| use Illuminate\Support\Facades\Schema; | ||
|
|
||
| return new class extends Migration | ||
| { | ||
| /** | ||
| * Run the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function up() | ||
| { | ||
| Schema::connection('sqlite3')->create('jobs', function (Blueprint $table) { | ||
| $table->bigIncrements('id'); | ||
| $table->string('queue')->index(); | ||
| $table->longText('payload'); | ||
| $table->unsignedTinyInteger('attempts'); | ||
| $table->unsignedInteger('reserved_at')->nullable(); | ||
| $table->unsignedInteger('available_at'); | ||
| $table->unsignedInteger('created_at'); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Reverse the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function down() | ||
| { | ||
| Schema::connection('sqlite3')->dropIfExists('jobs'); | ||
| } | ||
| }; |