Ensure we don't only select taxonomy when we actually want all term columns

Author: ryanmitchell

src/Taxonomies/TermQueryBuilder.php

@@ -175,7 +175,7 @@ public function get($columns = ['*'])
         $this->applyCollectionAndTaxonomyWheres();
 
         // Ensure 'taxonomy' is always selected as it's required for Term::fromModel().
-        if (! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
+        if (! empty($columns) && ! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
             $columns[] = 'taxonomy';
         }
 
@@ -218,7 +218,7 @@ public function paginate($perPage = null, $columns = [], $pageName = 'page', $pa
         $this->applyCollectionAndTaxonomyWheres();
 
         // Ensure 'taxonomy' is always selected as it's required for Term::fromModel().
-        if (! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
+        if (! empty($columns) && ! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
             $columns[] = 'taxonomy';
         }
 

tests/Data/Taxonomies/TermQueryBuilderTest.php

@@ -675,4 +675,61 @@ public function terms_are_found_using_where_relation()
         $this->assertCount(1, $terms);
         $this->assertEquals(['c'], $terms->map->slug->all());
     }
+
+    #[Test]
+    public function it_ensures_taxonomy_column_is_selected_when_columns_are_specified()
+    {
+        Taxonomy::make('tags')->save();
+        Term::make('a')->taxonomy('tags')->data(['title' => 'Term A', 'description' => 'Description A'])->save();
+        Term::make('b')->taxonomy('tags')->data(['title' => 'Term B', 'description' => 'Description B'])->save();
+
+        // When specific columns are requested (not including taxonomy), taxonomy should be auto-added
+        $terms = Term::query()->get(['slug', 'data']);
+        $this->assertCount(2, $terms);
+        $this->assertEquals(['a', 'b'], $terms->map->slug()->all());
+
+        // When empty array is passed, should not add taxonomy column
+        $terms = Term::query()->get([]);
+        $this->assertCount(2, $terms);
+        $this->assertEquals(['a', 'b'], $terms->map->slug()->all());
+
+        // When * is requested, taxonomy is included automatically
+        $terms = Term::query()->get(['*']);
+        $this->assertCount(2, $terms);
+        $this->assertEquals(['a', 'b'], $terms->map->slug()->all());
+
+        // When taxonomy is already included, should not be duplicated
+        $terms = Term::query()->get(['slug', 'taxonomy', 'data']);
+        $this->assertCount(2, $terms);
+        $this->assertEquals(['a', 'b'], $terms->map->slug()->all());
+    }
+
+    #[Test]
+    public function it_ensures_taxonomy_column_is_selected_when_paginating_with_columns()
+    {
+        Taxonomy::make('tags')->save();
+        Term::make('a')->taxonomy('tags')->data(['title' => 'Term A'])->save();
+        Term::make('b')->taxonomy('tags')->data(['title' => 'Term B'])->save();
+        Term::make('c')->taxonomy('tags')->data(['title' => 'Term C'])->save();
+
+        // When specific columns are requested in paginate (not including taxonomy), taxonomy should be auto-added
+        $paginated = Term::query()->paginate(2, ['slug', 'data']);
+        $this->assertCount(2, $paginated);
+        $this->assertEquals(['a', 'b'], $paginated->getCollection()->map->slug()->all());
+
+        // When empty array is passed to paginate, should not add taxonomy column
+        $paginated = Term::query()->paginate(2, []);
+        $this->assertCount(2, $paginated);
+        $this->assertEquals(['a', 'b'], $paginated->getCollection()->map->slug()->all());
+
+        // When * is requested in paginate, taxonomy is included automatically
+        $paginated = Term::query()->paginate(2, ['*']);
+        $this->assertCount(2, $paginated);
+        $this->assertEquals(['a', 'b'], $paginated->getCollection()->map->slug()->all());
+
+        // When taxonomy is already included in paginate, should not be duplicated
+        $paginated = Term::query()->paginate(2, ['slug', 'taxonomy', 'data']);
+        $this->assertCount(2, $paginated);
+        $this->assertEquals(['a', 'b'], $paginated->getCollection()->map->slug()->all());
+    }
 }