fix: single taxonomy query

Author: mehedimi

src/Relations/WithTaxonomy.php

@@ -99,9 +99,15 @@ protected function getLoadedItems()
                     $this->termTableName . '.term_id', '=', $this->termTableName . '.term_id'
                 )->whereIn($this->termRelationshipTable . '.object_id', $this->extractObjectKeys());
             })->join($this->termTaxonomyTable, function (Join $join) {
-                $join->on($this->termTaxonomyTable . '.term_taxonomy_id', '=', $this->termRelationshipTable . '.term_taxonomy_id');
+                $join->on($this->termTaxonomyTable . '.term_taxonomy_id', '=', $this->termRelationshipTable . '.term_taxonomy_id')
+                    ->whereColumn($this->termTableName.'.term_id', '=', $this->termTaxonomyTable.'.term_id');
+
                 if (!empty($this->taxonomies)) {
-                    $join->whereIn($this->termTaxonomyTable . '.taxonomy', $this->taxonomies);
+                    if (count($this->taxonomies) === 1) {
+                        $join->where($this->termTaxonomyTable . '.taxonomy', $this->taxonomies[0]);
+                    } else {
+                        $join->whereIn($this->termTaxonomyTable . '.taxonomy', $this->taxonomies);
+                    }
                 }
             })->get();
     }

tests/Unit/TaxonomyTest.php

@@ -37,13 +37,13 @@ function it_can_generate_correct_sql_query()
 
         $b = new Builder($c);
 
-        $sql = 'select wp_terms.*, wp_term_taxonomy.count, wp_term_taxonomy.taxonomy, wp_term_relationships.object_id from wp_terms inner join wp_term_relationships on wp_terms.term_id = wp_terms.term_id and wp_term_relationships.object_id in (?) inner join wp_term_taxonomy on wp_term_taxonomy.term_taxonomy_id = wp_term_relationships.term_taxonomy_id';
+        $sql = 'select wp_terms.*, wp_term_taxonomy.count, wp_term_taxonomy.taxonomy, wp_term_relationships.object_id from wp_terms inner join wp_term_relationships on wp_terms.term_id = wp_terms.term_id and wp_term_relationships.object_id in (?) inner join wp_term_taxonomy on wp_term_taxonomy.term_taxonomy_id = wp_term_relationships.term_taxonomy_id and wp_terms.term_id = wp_term_taxonomy.term_id';
 
         (new WithTaxonomy('taxonomies', $b))->setItems([(object)['ID' => 1]])->load();
 
         $this->assertEquals($sql, $b->toSQL());
 
-        $sql = "select wp_terms.*, wp_term_taxonomy.count, wp_term_taxonomy.taxonomy, wp_term_relationships.object_id from wp_terms inner join wp_term_relationships on wp_terms.term_id = wp_terms.term_id and wp_term_relationships.object_id in (?) inner join wp_term_taxonomy on wp_term_taxonomy.term_taxonomy_id = wp_term_relationships.term_taxonomy_id and wp_term_taxonomy.taxonomy in (?)";
+        $sql = "select wp_terms.*, wp_term_taxonomy.count, wp_term_taxonomy.taxonomy, wp_term_relationships.object_id from wp_terms inner join wp_term_relationships on wp_terms.term_id = wp_terms.term_id and wp_term_relationships.object_id in (?) inner join wp_term_taxonomy on wp_term_taxonomy.term_taxonomy_id = wp_term_relationships.term_taxonomy_id and wp_terms.term_id = wp_term_taxonomy.term_id and wp_term_taxonomy.taxonomy = ?";
         $b = new Builder($c);
         (new WithTaxonomy('taxonomies', $b))
             ->taxonomy('category')
@@ -52,6 +52,15 @@ function it_can_generate_correct_sql_query()
 
         $this->assertEquals($sql, $b->toSQL());
 
+        $sql = "select wp_terms.*, wp_term_taxonomy.count, wp_term_taxonomy.taxonomy, wp_term_relationships.object_id from wp_terms inner join wp_term_relationships on wp_terms.term_id = wp_terms.term_id and wp_term_relationships.object_id in (?) inner join wp_term_taxonomy on wp_term_taxonomy.term_taxonomy_id = wp_term_relationships.term_taxonomy_id and wp_terms.term_id = wp_term_taxonomy.term_id and wp_term_taxonomy.taxonomy in (?, ?)";
+        $c = new Builder($c);
+        (new WithTaxonomy('taxonomies', $c))
+            ->taxonomy(['category', 'tags'])
+            ->setItems([(object)['ID' => 1]])
+            ->load();
+
+        $this->assertEquals($sql, $c->toSQL());
+
         m::close();
     }