Add Scout 6 support

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.0.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v4.0.0) - 2018-11-15
+
+### Added
+
+- Added support for Scout 6
+
 ## [3.1.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v3.1.0) - 2018-10-20
 
 ### Added

README.md

@@ -12,10 +12,6 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 ## Contents
 
 - [Installation](#installation)
- - [Scout 5](#scout-5)
- - [Scout 4](#scout-4)
- - [Scout 2, 3](#scout-2-3)
- - [Scout 1](#scout-1)
  - [Laravel](#laravel)
  - [Lumen](#lumen)
 - [Configuration](#configuration)
@@ -36,25 +32,31 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 
 You can install the package via composer:
 
-### Scout 5
+**Scout 6**
 
 ``` bash
 composer require pmatseykanets/laravel-scout-postgres
 ```
 
-### Scout 4
+**Scout 5**
+
+``` bash
+composer require pmatseykanets/laravel-scout-postgres:3.1.0
+```
+
+**Scout 4**
 
 ``` bash
 composer require pmatseykanets/laravel-scout-postgres:2.3.0
 ```
 
-### Scout 2, 3
+**Scout 2, 3**
 
 ``` bash
 composer require pmatseykanets/laravel-scout-postgres:1.0.0
 ```
 
-### Scout 1
+**Scout 1**
 
 ``` bash
 composer require pmatseykanets/laravel-scout-postgres:0.2.1

composer.json

@@ -27,7 +27,7 @@
  "illuminate/contracts": "~5.4",
  "illuminate/database": "~5.4",
  "illuminate/support": "~5.4",
- "laravel/scout": "~5.0"
+ "laravel/scout": "~6.0"
  },
  "require-dev": {
  "phpunit/phpunit": "~6.0",

src/PostgresEngine.php

@@ -541,4 +541,23 @@ protected function usesSoftDeletes(Model $model)
  {
  return method_exists($model, 'getDeletedAtColumn');
  }
+
+ /**
+ * Flush all of the model's records from the engine.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return void
+ */
+ public function flush($model)
+ {
+ if (! $this->shouldMaintainIndex($model)) {
+ return;
+ }
+
+ $indexColumn = $this->getIndexColumn($model);
+
+ $this->database
+ ->table($model->searchableAs())
+ ->update([$indexColumn => null]);
+ }
 }

tests/PostgresEngineTest.php

@@ -74,15 +74,32 @@ public function test_delete_do_nothing_if_index_maintenance_turned_off_globally(
  {
  list($engine, $db) = $this->getEngine(['maintain_index' => false]);
 
+ $db->shouldNotReceive('table');
+
+ $engine->delete(Collection::make([new TestModel()]));
+ }
+
+ public function test_flush_removes_all_objects_from_index()
+ {
+ list($engine, $db) = $this->getEngine();
+
  $db->shouldReceive('table')
+ ->once()
  ->andReturn($table = Mockery::mock('stdClass'));
- $table->shouldReceive('whereIn')
- ->with('id', [1])
- ->andReturnSelf();
  $table->shouldReceive('update')
+ ->once()
  ->with(['searchable' => null]);
 
- $engine->delete(Collection::make([new TestModel()]));
+ $engine->flush(new TestModel());
+ }
+
+ public function test_flush_does_nothing_if_index_maintenance_turned_off_globally()
+ {
+ list($engine, $db) = $this->getEngine(['maintain_index' => false]);
+
+ $db->shouldNotReceive('table');
+
+ $engine->flush(new TestModel());
  }
 
  public function test_search()