From a47d5e8a8e719030dc98ec06e601a7f48c36a33c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 4 Dec 2017 13:59:24 +1300 Subject: [PATCH] FIX Use correct namespace for SQLite3 adapter, implement injector prioritisation for database --- .upgrade.yml | 3 +-- _config/database.yml | 4 ++++ .../Captures/SearchManipulateCapture_SQLite3Database.php | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index 1210089..0f5d5d2 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -12,8 +12,7 @@ mappings: SearchQuery: SilverStripe\FullTextSearch\Search\Queries\SearchQuery SearchQuery_Range: SilverStripe\FullTextSearch\Search\Queries\SearchQuery_Range SearchUpdater: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater - SearchUpdater_BindManipulationCaptureFilter: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_BindManipulationCaptureFilter - SearchUpdater_ObjectHandler: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_ObjectHandler + SearchUpdater_ObjectHandler: SilverStripe\FullTextSearch\Search\Extensions\SearchUpdater_ObjectHandler SearchVariant: SilverStripe\FullTextSearch\Search\Variants\SearchVariant SearchVariant_Caller: SilverStripe\FullTextSearch\Search\Variants\SearchVariant_Caller SearchVariantSubsites: SilverStripe\FullTextSearch\Search\Variants\SearchVariantSubsites diff --git a/_config/database.yml b/_config/database.yml index daf9882..c81fb42 100644 --- a/_config/database.yml +++ b/_config/database.yml @@ -22,7 +22,11 @@ SilverStripe\Core\Injector\Injector: --- Name: fulltextsearchsqlite +After: + - 'sqlite3connectors' --- SilverStripe\Core\Injector\Injector: + SQLite3PDODatabase: + class: SilverStripe\FullTextSearch\Search\Captures\SearchManipulateCapture_SQLite3Database SQLite3Database: class: SilverStripe\FullTextSearch\Search\Captures\SearchManipulateCapture_SQLite3Database diff --git a/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php b/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php index d534415..9c1fcbf 100644 --- a/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php +++ b/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php @@ -2,10 +2,10 @@ namespace SilverStripe\FullTextSearch\Search\Captures; -use SilverStripe\SQLite\SQLite3Database; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; +use SilverStripe\SQLite\SQLite3Database; -if (!class_exists('SQLite3Database')) { +if (!class_exists(SQLite3Database::class)) { return; }