Fix migrations for MySQL 8

REBELinBLUE · Oct 3, 2021 · 081c982 · 081c982
1 parent 6670a0f
commit 081c982
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -87,11 +87,11 @@ test: lint phpcs phpunit ##@shortcuts Runs most tests; but excludes integration
 
 fulltest: lint phpcs phpunit integration ##@shortcuts Runs all tests
 
-run: ##@docker Runs the containers
-	@docker-compose up -d --remove-orphans
+run: deps ##@docker Runs the containers
+	@docker-compose -f docker-compose.yml -f docker-compose.override.yml up -d --remove-orphans
 
-dev: ##@docker Runs the containers with dev options
-	@docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --remove-orphans
+dev: deps ##@docker Runs the containers with dev options
+	@docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.dev.yml up -d --remove-orphans
 
 stop: ##@docker Stops the containers
 	@docker-compose down
@@ -121,6 +121,9 @@ reset: clean
 	-rm database/database.sqlite
 	-rm database/backups/*
 
+deps:
+	test -f docker-compose.override.yml || echo 'version: "3"' > docker-compose.override.yml
+
 ## Generates helper files for IDEs
 #ide:
 #	php artisan clear-compiled

diff --git a/database/migrations/2016_09_06_193034_fix_timestamp_defaults.php b/database/migrations/2016_09_06_193034_fix_timestamp_defaults.php
@@ -14,14 +14,13 @@ class FixTimestampDefaults extends Migration
      */
     public function up()
     {
-        $connection = config('database.default');
-        $driver     = config('database.connections.' . $connection . '.driver');
+        $driver = DB::getDriverName();
         if ($driver === 'mysql') {
             DB::statement("SET SESSION sql_mode='ALLOW_INVALID_DATES'");
 
             foreach ($this->tables as $table) {
-                DB::statement("ALTER TABLE {$table} MODIFY COLUMN created_at timestamp NULL DEFAULT NULL");
-                DB::statement("ALTER TABLE {$table} MODIFY COLUMN updated_at timestamp NULL DEFAULT NULL");
+                DB::statement("ALTER TABLE `{$table}` MODIFY COLUMN created_at timestamp NULL DEFAULT NULL");
+                DB::statement("ALTER TABLE `{$table}` MODIFY COLUMN updated_at timestamp NULL DEFAULT NULL");
             }
 
             DB::statement('ALTER TABLE failed_jobs MODIFY COLUMN failed_at timestamp NULL DEFAULT NULL');