Using addresses.id automatic type detection in migrations

- Test fixes
artkonekt · Oct 18, 2023 · da5f0e6 · da5f0e6
1 parent 2aa5581
commit da5f0e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,21 +28,21 @@ jobs:
       - name: Create SQLite Database
         run: mkdir -p database && touch database/database.sqlite
       - name: Run Tests [sqlite]
-        run: php vendor/bin/phpunit --testdox
+        run: php vendor/bin/phpunit --testdox --stop-on-error --display-errors
         env:
           TEST_DB_ENGINE: sqlite
       - name: Run Tests [mysql 5.7]
-        run: php vendor/bin/phpunit
+        run: php vendor/bin/phpunit --testdox --stop-on-error --display-errors
         env:
           TEST_DB_ENGINE: mysql
           TEST_DB_PORT: ${{ job.services.mysql.ports[3306] }}
       - name: Run Tests [mysql 8.0]
-        run: php vendor/bin/phpunit --testdox
+        run: php vendor/bin/phpunit --testdox --stop-on-error --display-errors
         env:
           TEST_DB_ENGINE: mysql
           TEST_DB_PORT: ${{ job.services.mysql8.ports[3306] }}
       - name: Run Tests [postgres]
-        run: php vendor/bin/phpunit --testdox
+        run: php vendor/bin/phpunit --testdox --stop-on-error --display-errors
         env:
           TEST_DB_ENGINE: pgsql
           TEST_DB_PORT: ${{ job.services.postgres.ports[5432] }}

diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "konekt/enum": "^4.1",
         "konekt/user": "^3.0",
         "konekt/address": "^3.0",
+        "konekt/laravel-migration-compatibility": "^1.6",
         "laravel/framework": "^10.0"
     },
     "require-dev": {

diff --git a/...atabase/migrations/2023_10_18_173544_add_default_address_fields_to_the_customer_table.php b/...atabase/migrations/2023_10_18_173544_add_default_address_fields_to_the_customer_table.php
@@ -10,8 +10,8 @@
     public function up(): void
     {
         Schema::table('customers', function (Blueprint $table) {
-            $table->unsignedInteger('default_billing_address_id')->nullable();
-            $table->unsignedInteger('default_shipping_address_id')->nullable();
+            $table->intOrBigIntBasedOnRelated('default_billing_address_id', Schema::connection(null), 'addresses.id')->nullable();
+            $table->intOrBigIntBasedOnRelated('default_shipping_address_id', Schema::connection(null), 'addresses.id')->nullable();
 
             $table->foreign('default_billing_address_id')->references('id')->on('addresses')->nullOnDelete();
             $table->foreign('default_shipping_address_id')->references('id')->on('addresses')->nullOnDelete();

diff --git a/tests/AddressDefaultsTest.php b/tests/AddressDefaultsTest.php
@@ -15,10 +15,17 @@
 namespace Konekt\Customer\Tests;
 
 use Konekt\Address\Models\Address;
+use Konekt\Address\Models\Country;
 use Konekt\Customer\Models\Customer;
 
 class AddressDefaultsTest extends TestCase
 {
+    public function setUp(): void
+    {
+        parent::setUp();
+        Country::firstOrCreate(['id' => 'UK'], ['id' => 'UK', 'name' => 'United Kingdom', 'phonecode' => '44', 'is_eu_member' => false]);
+    }
+
     /** @test */
     public function customer_has_no_default_addresses_by_default()
     {