Add queryCallback, whereIn and whereNotIn support.

Author: willvincent

src/PostgresEngine.php

@@ -365,11 +365,26 @@ protected function performSearch(Builder $builder, ?int $perPage = 0, int $page
             ->selectRaw('COUNT(*) OVER () AS total_count')
             ->whereRaw("{$indexColumn} @@ \"tsquery\"");
 
+        // Apply query callback if set
+        if ($builder->queryCallback) {
+            call_user_func($builder->queryCallback, $builder);
+        }
+
         // Apply where clauses that were set on the builder instance if any
         foreach ($builder->wheres as $key => $value) {
             $query->where($key, $value);
         }
 
+        // Apply whereIn clauses that were set on the builder instance if any
+        foreach ($builder->whereIns as $key => $value) {
+            $query->whereIn($key, $value);
+        }
+
+        // Apply whereNoIn clauses that were set on the builder instance if any
+        foreach ($builder->whereNotIns as $key => $value) {
+            $query->whereNotIn($key, $value);
+        }
+
         // If parsed documents are being stored in the model's table
         if (! $this->isExternalIndex($builder->model)) {
             // and the model uses soft deletes we need to exclude trashed rows

tests/PostgresEngineTest.php

@@ -180,6 +180,85 @@ public function search_with_order_by()
         $engine->search($builder);
     }
 
+    /**
+     * @test
+     */
+    public function search_with_queryCallback()
+    {
+        [$engine, $db] = $this->getEngine();
+
+        $skip = 0;
+        $limit = 5;
+        $table = $this->setDbExpectations($db);
+
+        $table->shouldReceive('skip')->with($skip)->andReturnSelf()
+            ->shouldReceive('limit')->with($limit)->andReturnSelf()
+            ->shouldReceive('where')->with('bar', 1)->andReturnSelf()
+            ->shouldReceive('where')->with('baz', 'qux')
+            ->shouldReceive('getBindings')->andReturn([null, 'foo', 1, 'qux']);
+
+        $db->shouldReceive('select')
+            ->with(null, $table->getBindings())
+            ->once();
+
+        $builder = new Builder(new TestModel, 'foo');
+        $builder->query(function ($q) {
+            $q->where('bar', 1)
+                ->where('baz', 'qux')
+                ->take(5);
+        });
+
+        $engine->search($builder);
+    }
+
+    /**
+     * @test
+     */
+    public function search_with_whereIn()
+    {
+        [$engine, $db] = $this->getEngine();
+
+        $skip = 0;
+        $limit = 5;
+        $table = $this->setDbExpectations($db);
+
+        $table->shouldReceive('whereIn')->with('bar', [1])->andReturnSelf()
+            ->shouldReceive('getBindings')->andReturn([null, 'foo', [1]]);
+
+        $db->shouldReceive('select')
+            ->with(null, $table->getBindings())
+            ->once();
+
+        $builder = new Builder(new TestModel, 'foo');
+        $builder->whereIn('bar', [1]);
+
+        $engine->search($builder);
+    }
+
+    /**
+     * @test
+     */
+    public function search_with_whereNotIn()
+    {
+        [$engine, $db] = $this->getEngine();
+
+        $skip = 0;
+        $limit = 5;
+        $table = $this->setDbExpectations($db);
+
+        $table->shouldReceive('whereNotIn')->with('bar', [1])->andReturnSelf()
+            ->shouldReceive('getBindings')->andReturn([null, 'foo', [1]]);
+
+        $db->shouldReceive('select')
+            ->with(null, $table->getBindings())
+            ->once();
+
+        $builder = new Builder(new TestModel, 'foo');
+        $builder->whereNotIn('bar', [1]);
+
+        $engine->search($builder);
+    }
+
     /**
      * @test
      */