Merge pull request #22 from tortuetorche/refactoring-bindings

Refactoring bindings in PostgresEngine::performSearch() method

Author: pmatseykanets

src/PostgresEngine.php

@@ -219,8 +219,6 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
         // does not receive a model instance
         $this->preserveModel($builder->model);
 
-        $bindings = collect([]);
-
         $indexColumn = $this->getIndexColumn($builder->model);
 
         // Build the SQL query
@@ -234,7 +232,6 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
         // Apply where clauses that were set on the builder instance if any
         foreach ($builder->wheres as $key => $value) {
             $query->where($key, $value);
-            $bindings->push($value);
         }
 
         // If parsed documents are being stored in the model's table
@@ -270,14 +267,11 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
             : $this->defaultQueryMethod($builder->query, $this->searchConfig($builder->model));
 
         $query->crossJoin($this->database->raw($tsQuery->sql().' AS "tsquery"'));
-
-        // Transfer bindings
-        foreach ($tsQuery->bindings() as $binding) {
-            $bindings->prepend($binding);
-        }
+        // Add TS bindings to the query
+        $query->addBinding($tsQuery->bindings(), 'join');
 
         return $this->database
-            ->select($query->toSql(), $bindings->all());
+            ->select($query->toSql(), $query->getBindings());
     }
 
     /**

src/TsQuery/BaseTsQueryable.php

@@ -54,6 +54,6 @@ public function sql()
      */
     public function bindings()
     {
-        return [$this->query, $this->config];
+        return [$this->config, $this->query];
     }
 }

tests/PostgresEngineTest.php

@@ -96,10 +96,11 @@ public function test_search()
         $table->shouldReceive('skip')->with($skip)->andReturnSelf()
             ->shouldReceive('limit')->with($limit)->andReturnSelf()
             ->shouldReceive('where')->with('bar', 1)->andReturnSelf()
-            ->shouldReceive('where')->with('baz', 'qux');
+            ->shouldReceive('where')->with('baz', 'qux')
+            ->shouldReceive('getBindings')->andReturn([null, 'foo', 1, 'qux']);
 
         $db->shouldReceive('select')
-            ->with(null, [null, 'foo', 1, 'qux']);
+            ->with(null, $table->getBindings());
 
         $builder = new Builder(new TestModel(), 'foo');
         $builder->where('bar', 1)
@@ -116,10 +117,11 @@ public function test_search_with_order_by()
         $table = $this->setDbExpectations($db, false);
 
         $table->shouldReceive('orderBy')->with('bar', 'desc')->andReturnSelf()
-            ->shouldReceive('orderBy')->with('baz', 'asc')->andReturnSelf();
+            ->shouldReceive('orderBy')->with('baz', 'asc')->andReturnSelf()
+            ->shouldReceive('getBindings')->andReturn([null, 'foo']);
 
         $db->shouldReceive('select')
-            ->with(null, [null, 'foo']);
+            ->with(null, $table->getBindings());
 
         $builder = new Builder(new TestModel(), 'foo');
         $builder->orderBy('bar', 'desc')
@@ -138,9 +140,10 @@ public function test_search_with_global_config()
 
         $table->shouldReceive('skip')->with($skip)->andReturnSelf()
             ->shouldReceive('limit')->with($limit)->andReturnSelf()
-            ->shouldReceive('where')->with('bar', 1);
+            ->shouldReceive('where')->with('bar', 1)
+            ->shouldReceive('getBindings')->andReturn(['simple', 'foo', 1]);
 
-        $db->shouldReceive('select')->with(null, ['simple', 'foo', 1]);
+        $db->shouldReceive('select')->with(null, $table->getBindings());
 
         $builder = new Builder(new TestModel(), 'foo');
         $builder->where('bar', 1)->take(5);
@@ -158,9 +161,10 @@ public function test_search_with_model_config()
 
         $table->shouldReceive('skip')->with($skip)->andReturnSelf()
             ->shouldReceive('limit')->with($limit)->andReturnSelf()
-            ->shouldReceive('where')->with('bar', 1);
+            ->shouldReceive('where')->with('bar', 1)
+            ->shouldReceive('getBindings')->andReturn(['english', 'foo', 1]);
 
-        $db->shouldReceive('select')->with(null, ['english', 'foo', 1]);
+        $db->shouldReceive('select')->with(null, $table->getBindings());
 
         $model = new TestModel();
         $model->searchableOptions['config'] = 'english';
@@ -180,9 +184,10 @@ public function test_search_with_soft_deletes()
         $table->shouldReceive('skip')->with(0)->andReturnSelf()
             ->shouldReceive('limit')->with(5)->andReturnSelf()
             ->shouldReceive('where')->with('bar', 1)->andReturnSelf()
-            ->shouldReceive('whereNull')->with('deleted_at');
+            ->shouldReceive('whereNull')->with('deleted_at')
+            ->shouldReceive('getBindings')->andReturn([null, 'foo', 1]);
 
-        $db->shouldReceive('select')->with(null, [null, 'foo', 1]);
+        $db->shouldReceive('select')->with(null, $table->getBindings());
 
         $builder = new Builder(new SoftDeletableTestModel(), 'foo');
         $builder->where('bar', 1)->take(5);
@@ -240,7 +245,8 @@ public function test_map_ids_returns_right_key()
     {
         list($engine, $db) = $this->getEngine();
 
-        $this->setDbExpectations($db);
+        $table = $this->setDbExpectations($db);
+        $table->shouldReceive('getBindings')->andReturn([null, 'foo']);
 
         $db->shouldReceive('select')
             ->andReturn(json_decode('[{"id": 1}, {"id": 2}]'));
@@ -275,6 +281,9 @@ protected function setDbExpectations($db, $withDefaultOrderBy = true)
         $table->shouldReceive('crossJoin')
                 ->with('plainto_tsquery(COALESCE(?, get_current_ts_config()), ?) AS "tsquery"')
                 ->andReturnSelf()
+            ->shouldReceive('addBinding')
+                ->with(Mockery::type('array'), 'join')
+                ->andReturnSelf()
             ->shouldReceive('select')
                 ->with('id')
                 ->andReturnSelf()