Merge pull request #16 from thedevdojo/fixingConditionalColumns

Adding updates to schema
thedevdojo · May 21, 2024 · ee19d01 · ee19d01
2 parents 303b059 + eac9c78
commit ee19d01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,6 +50,10 @@ jobs:
     - name: Publish the DevDojo Configs
       run: php artisan vendor:publish --tag=auth:config
       working-directory: ./laravel_app
+
+    - name: Publish the DevDojo Auth Migrations
+      run: php artisan vendor:publish --tag=auth:migrations
+      working-directory: ./laravel_app
 
     - name: Remove current tests and symlink to DevDojo Auth
       run: |

diff --git a/database/migrations/2024_05_07_000003_add_two_factor_auth_columns.php b/database/migrations/2024_05_07_000003_add_two_factor_auth_columns.php
@@ -13,19 +13,19 @@ public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
 
-            if (! $table->hasColumn('two_factor_secret')) {
+            if (! Schema::hasColumn('users', 'two_factor_secret')) {
                 $table->text('two_factor_secret')
                     ->after('password')
                     ->nullable();
             }
 
-            if (! $table->hasColumn('two_factor_recovery_codes')) {
+            if (! Schema::hasColumn('users', 'two_factor_recovery_codes')) {
                 $table->text('two_factor_recovery_codes')
                     ->after('two_factor_secret')
                     ->nullable();
             }
 
-            if (! $table->hasColumn('two_factor_confirmed_at')) {
+            if (! Schema::hasColumn('users', 'two_factor_confirmed_at')) {
                 $table->timestamp('two_factor_confirmed_at')
                     ->after('two_factor_recovery_codes')
                     ->nullable();