Fix #2

Cast nulls to empty strings in `toVector()`.

Author: pmatseykanets

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to `pmatseykanets/laravel-hipchat-slash` will be documented
 
 ## [Unreleased]
 
+## [0.2.1](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.2.1) - 2016-12-23
+### Changed
+- Fixed #2. Cast nulls to empty strings in `toVector()`. 
+
 ## [0.2.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.2.0) - 2016-10-07
 ### Added
 - Implemented `getTotalCount()` method to support length aware pagination. 

src/PostgresEngine.php

@@ -99,16 +99,18 @@ protected function performUpdate(Model $model)
      */
     protected function toVector(Model $model)
     {
-        $fields = collect($model->toSearchableArray());
-
-        $select = $fields->map(function ($value) {
-            return $value === null ? '' : $value;
-        })->map(function ($_, $key) use ($model) {
-            if ($label = $this->rankFieldWeightLabel($model, $key)) {
-                return "setweight(to_tsvector(?), '$label')";
-            }
-
-            return 'to_tsvector(?)';
+        $fields = collect($model->toSearchableArray())
+            ->map(function ($value) {
+                return $value === null ? '' : $value;
+            });
+
+        $select = $fields->keys()
+            ->map(function ($key) use ($model) {
+                $vector = "to_tsvector(?)";
+                if ($label = $this->rankFieldWeightLabel($model, $key)) {
+                    $vector = "setweight($vector, '$label')";
+                }
+                return $vector;
         })->implode(' || ');
 
         return $this->database
@@ -322,7 +324,8 @@ protected function rankFieldWeightLabel(Model $model, $field)
     {
         $label = $this->option($model, "rank.fields.$field");
 
-        return collect(['A', 'B', 'C', 'D'])->contains($label) ? $label : '';
+        return collect(['A', 'B', 'C', 'D'])
+            ->contains($label) ? $label : '';
     }
 
     /**

tests/PostgresEngineTest.php

@@ -26,7 +26,7 @@ public function test_update_adds_object_to_index()
         $db->shouldReceive('query')
             ->andReturn($query = Mockery::mock('stdClass'));
         $query->shouldReceive('selectRaw')
-            ->with('to_tsvector(?) AS tsvector', ['Foo'])
+            ->with("to_tsvector(?) || setweight(to_tsvector(?), 'B') AS tsvector", ['Foo', ''])
             ->andReturnSelf();
         $query->shouldReceive('value')
             ->with('tsvector')
@@ -154,7 +154,13 @@ class TestModel extends Model
 
     public $text = 'Foo';
 
-    protected $searchableOptions = [];
+    protected $searchableOptions = [
+        'rank' => [
+            'fields' => [
+                'nullable' => 'B',
+            ],
+        ],
+    ];
 
     protected $searchableAdditionalArray = [];
 
@@ -180,7 +186,10 @@ public function getTable()
 
     public function toSearchableArray()
     {
-        return ['text' => $this->text];
+        return [
+            'text' => $this->text,
+            'nullable' => null,
+        ];
     }
 
     public function searchableOptions()