adds a working test for testing ambiguous column id when using Relation fix

Took 27 minutes

Author: fabio-ivona

database/migrations/create_test_tables.php.stub

@@ -35,5 +35,17 @@ class CreateTestTables extends Migration
             $table->foreign('species_id')->references('id')->on('species');
             $table->foreign('breed_id')->references('id')->on('breeds');
         });
+
+        Schema::create('veterinaries', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->index();
+            $table->string('phone')->index();
+        });
+
+        Schema::create('pet_veterinary', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('pet_id')->constrained();
+            $table->foreignId('veterinary_id')->constrained();
+        });
     }
 }

tests/Http/Livewire/CatsTable.php renamed to tests/Http/Livewire/PetVeterinariesTable.php

@@ -6,42 +6,36 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
-class CatsTable extends DataTableComponent
+class PetVeterinariesTable extends DataTableComponent
 {
+    public Pet $pet;
+
     public array $bulkActions = [
-        'feed' => 'Feed selected',
+        'count' => 'Count selected',
     ];
 
     public function query(): Relation
     {
-        /** @var Species $dogSpecimen */
-        $dogSpecimen = Species::query()->where('name', 'Cat')->first();
-
-        return $dogSpecimen->pets()->with('species')->with('breed');
+        return $this->pet->veterinaries();
     }
 
     public function columns(): array
     {
         return [
             Column::make('Name', 'name')
                 ->searchable(),
-            Column::make('Age', 'age')
+            Column::make('Phone', 'phone')
                 ->searchable(function (Builder $query, $search) {
-                    $query->orWhere('age', '=', $search);
+                    $query->orWhere('phone', '=', $search);
                 }),
-            Column::make('Last Visit', 'last_visit')
-                ->searchable(),
-            Column::make('Species', 'species.name')
-                ->searchable(),
-            Column::make('Breed', 'breed.name')
-                ->searchable(),
         ];
     }
 
-    public function feed(): int{
+    public function count(): int{
         return $this->selectedRowsQuery()->count();
     }
 }

tests/Models/Pet.php

@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property int $id
@@ -64,4 +65,8 @@ public function breed()
     {
         return $this->belongsTo(Breed::class);
     }
+
+    public function veterinaries(): BelongsToMany{
+        return $this->belongsToMany(Veterinary::class);
+    }
 }

tests/Models/Veterinary.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Veterinary extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'veterinaries';
+
+    /**
+     * The primary key for the model.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * @var bool
+     */
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'name',
+        'phone',
+    ];
+
+    public function pets(): BelongsToMany{
+        return $this->belongsToMany(Pet::class);
+    }
+}

tests/RelationshipDataTableComponentTest.php

@@ -6,7 +6,8 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
-use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\CatsTable;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetVeterinariesTable;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 
 class RelationshipDataTableComponentTest extends TestCase
 {
@@ -16,7 +17,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->table = new CatsTable();
+        $this->table = new PetVeterinariesTable();
+        $this->table->pet = Pet::find(1);
     }
 
     /** @test */
@@ -30,7 +32,7 @@ public function columns(): void
     {
         $columns = $this->table->columns();
 
-        $this->assertCount(5, $columns);
+        $this->assertCount(2, $columns);
     }
 
     /** @test */
@@ -72,36 +74,36 @@ public function pagination_disabled(): void
     /** @test */
     public function search_filter(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->assertEquals(1, $this->table->getRowsProperty()->total());
     }
 
     /** @test */
     public function search_filter_reset(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->table->resetFilters();
         $this->assertEquals(1, $this->table->rows->total());
     }
 
     /** @test */
     public function search_filter_remove(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->table->removeFilter('search');
         $this->assertEquals(2, $this->table->rows->total());
     }
 
     /** @test */
     public function search_filter_callback(): void
     {
-        $this->table->filters['search'] = '22';
+        $this->table->filters['search'] = '123456798';
         $this->assertEquals(1, $this->table->getRowsProperty()->total());
     }
 
     /** @test */
     public function bulk_actions(){
         $this->table->selected[] = 1;
-        $this->assertEquals(1, $this->table->feed());
+        $this->assertEquals(1, $this->table->count());
     }
 }

tests/TestCase.php

@@ -2,11 +2,14 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
+use DB;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Rappasoft\LaravelLivewireTables\LaravelLivewireTablesServiceProvider;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Veterinary;
+use Symfony\Component\Console\Helper\Table;
 
 class TestCase extends Orchestra
 {
@@ -44,6 +47,19 @@ protected function setUp(): void
             [ 'id' => 4, 'name' => 'Ben', 'age' => 5, 'species_id' => 3, 'breed_id' => 200 ],
             [ 'id' => 5, 'name' => 'Chico', 'age' => 7, 'species_id' => 3, 'breed_id' => 202 ],
         ]);
+
+        Veterinary::insert([
+            ['id' => 1, 'name' => 'Dr John Smith', 'phone' => "123456798"],
+            ['id' => 2, 'name' => 'Dr Fabio Ivona', 'phone' => "789456123"],
+            ['id' => 3, 'name' => 'Dr Anthony Rappa', 'phone' => "987654321"],
+        ]);
+
+        DB::table('pet_veterinary')->insert([
+            ['id' => 1, 'pet_id' => 1, 'veterinary_id' => 1],
+            ['id' => 2, 'pet_id' => 1, 'veterinary_id' => 2],
+            ['id' => 3, 'pet_id' => 2, 'veterinary_id' => 1],
+            ['id' => 4, 'pet_id' => 2, 'veterinary_id' => 3],
+        ]);
     }
 
     protected function getPackageProviders($app)