Almost all primary keys are related to their tables

Author: nealarec

src/Config/ModelConfig.php

@@ -20,7 +20,25 @@ class ModelConfig
     public function __construct(Model $model)
     {
         $this->model = $model;
-        $this->config = $this->hasConfig() ? $this->getConfig() : [];
+$this->config = $this->hasConfig() ? $this->getConfig() : [];
+
+    }
+
+
+    public function getPrimaryColumn(): string {
+        $table = $this->model->getTable();
+        $primaryKey = $this->model->getKeyName();
+        return $table. '.'. $primaryKey;
+    }
+
+    /**
+     * @param string $column
+     *
+     * @return bool
+     */
+    public function isPrimaryKey($column): bool
+    {
+        return $this->model->getKeyName() === $column;
     }
 
     public function hasConfig(): bool

src/SearchCallbacks/AbstractCallback.php

@@ -38,7 +38,7 @@ public function __construct(Builder $builder, SearchParserInterface $searchParse
         $this->categorizedValues = new CategorizedValues($this->searchParser);
 
         $this->builder->when(
-            str_contains($this->searchParser->column, '.'),
+            $this->searchParser->isModelRelation(),
             function (Builder $builder) {
                 // Hack for whereDoesntHave relation, doesn't work recursively.
                 if (str_contains($this->searchParser->column, '!') !== false) {

src/SearchParser.php

@@ -40,7 +40,8 @@ class SearchParser implements SearchParserInterface
     public function __construct(ModelConfig $modelConfig, OperatorsConfig $operatorsConfig, string $column, string $argument)
     {
         $this->modelConfig = $modelConfig;
-        $this->column = $column;
+        $this->column = $modelConfig->isPrimaryKey($column) ? 
+            $modelConfig->getPrimaryColumn() : $column;
         $this->argument = $argument;
 
         $this->checkForForbiddenColumns();
@@ -51,6 +52,20 @@ public function __construct(ModelConfig $modelConfig, OperatorsConfig $operators
         $this->type = $this->getColumnType();
     }
 
+    /**
+     * @return bool
+     *
+     * @throws JsonQueryBuilderException
+     */
+    public function isModelRelation(): bool
+    {
+        if (!str_contains($this->column, '.')) {
+            return false;
+        }
+        $relation = explode('.', $this->column)[0];
+        return in_array($relation, $this->modelConfig->getRelations());
+    }
+
     /**
      * @param  $operators
      * @param  string  $argument

tests/TestModel.php

@@ -6,7 +6,17 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+class Tag extends Model
+{
+}
+
+
+
 class TestModel extends Model
 {
     protected $table = 'test';
+
+    public function tags() {
+        return $this->morphToMany(Tag::class, "taggable");
+    }
 }

tests/Unit/JsonQueryTest.php

@@ -139,7 +139,7 @@ public function searches_with_or_micro_operator()
         $jsonQuery = new JsonQuery($this->builder, $input);
         $jsonQuery->search();
 
-        $sql = 'select * from "test" where ((("id" in (?)) or ("id" in (?))))';
+        $sql = 'select * from "test" where ((("test"."id" in (?)) or ("test"."id" in (?))))';
 
         $this->assertEquals($sql, $this->builder->toSql());
     }
@@ -156,7 +156,7 @@ public function searches_with_and_micro_operator()
         $jsonQuery = new JsonQuery($this->builder, $input);
         $jsonQuery->search();
 
-        $sql = 'select * from "test" where ((("id" in (?) and "id" in (?))))';
+        $sql = 'select * from "test" where ((("test"."id" in (?) and "test"."id" in (?))))';
 
         $this->assertEquals($sql, $this->builder->toSql());
     }
@@ -317,7 +317,28 @@ public function can_recurse_absurdly_deep()
         $jsonQuery = new JsonQuery($this->builder, $input);
         $jsonQuery->search();
 
-        $sql = 'select * from "test" where ((((("id" in (?)) or ("id" in (?))) and (("name" in (?)))) or ((("id" in (?))) and (("name" LIKE ? and "name" LIKE ?)))) and ((("we" in (?)))) or (("love" < ?)) or (("recursion" in (?))))';
+        $sql = 'select * from "test" where ((((("test"."id" in (?)) or ("test"."id" in (?))) and (("name" in (?)))) or ((("test"."id" in (?))) and (("name" LIKE ? and "name" LIKE ?)))) and ((("we" in (?)))) or (("love" < ?)) or (("recursion" in (?))))';
+
+        $this->assertEquals($sql, $this->builder->toSql());
+    }
+
+    /** @test */
+    public function can_query_by_many_to_many_relationships()
+    {
+        $input = [
+            'search' => [
+                'tags' => [
+                    "search" => [
+                        "id" => "=1",
+                    ],
+                ],
+            ],
+        ];
+
+        $jsonQuery = new JsonQuery($this->builder, $input);
+        $jsonQuery->search();
+
+        $sql = 'select * from "test" where (exists (select * from "tags" inner join "taggables" on "tags"."id" = "taggables"."tag_id" where "test"."id" = "taggables"."taggable_id" and "taggables"."taggable_type" = ? and ((("tags"."id" in (?))))))';
 
         $this->assertEquals($sql, $this->builder->toSql());
     }

tests/Unit/RequestParameters/SearchParameterTest.php

@@ -27,6 +27,7 @@ public function setUp(): void
         $this->modelConfig = Mockery::mock(ModelConfig::class);
         $this->modelConfig->shouldReceive('getForbidden')->andReturn([]);
         $this->modelConfig->shouldReceive('getModelColumns')->andReturn([]);
+        $this->modelConfig->shouldReceive('isPrimaryKey')->andReturn(false);
     }
 
     protected function createSearchParameter(array $arguments): SearchParameter

tests/Unit/SearchCallbacks/BetweenTest.php

@@ -28,6 +28,7 @@ public function setUp(): void
         $this->searchParser = Mockery::mock(SearchParser::class);
         $this->searchParser->type = 'test';
         $this->searchParser->column = 'test';
+        $this->searchParser->shouldReceive('isModelRelation')->andReturn(false);
     }
 
     /** @test */

tests/Unit/SearchCallbacks/EqualsTest.php

@@ -27,6 +27,7 @@ public function setUp(): void
         $this->searchParser = Mockery::mock(SearchParser::class);
         $this->searchParser->type = 'test';
         $this->searchParser->column = 'test';
+        $this->searchParser->shouldReceive('isModelRelation')->andReturn(false);
     }
 
     /** @test */

tests/Unit/SearchCallbacks/GreaterThanOrEqualTest.php

@@ -27,6 +27,7 @@ public function setUp(): void
         $this->searchParser = Mockery::mock(SearchParser::class);
         $this->searchParser->type = 'test';
         $this->searchParser->column = 'test';
+        $this->searchParser->shouldReceive('isModelRelation')->andReturn(false);
     }
 
     /** @test */

tests/Unit/SearchCallbacks/GreaterThanTest.php

@@ -27,6 +27,7 @@ public function setUp(): void
         $this->searchParser = Mockery::mock(SearchParser::class);
         $this->searchParser->type = 'test';
         $this->searchParser->column = 'test';
+        $this->searchParser->shouldReceive('isModelRelation')->andReturn(false);
     }
 
     /** @test */