FIX Use correct namespace for SQLite3 adapter, implement injector prioritisation for database

This commit is contained in:
Robbie Averill 2017-12-04 13:59:24 +13:00
parent 21a045165b
commit a47d5e8a8e
3 changed files with 7 additions and 4 deletions

View File

@ -12,8 +12,7 @@ mappings:
SearchQuery: SilverStripe\FullTextSearch\Search\Queries\SearchQuery SearchQuery: SilverStripe\FullTextSearch\Search\Queries\SearchQuery
SearchQuery_Range: SilverStripe\FullTextSearch\Search\Queries\SearchQuery_Range SearchQuery_Range: SilverStripe\FullTextSearch\Search\Queries\SearchQuery_Range
SearchUpdater: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater SearchUpdater: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater
SearchUpdater_BindManipulationCaptureFilter: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_BindManipulationCaptureFilter SearchUpdater_ObjectHandler: SilverStripe\FullTextSearch\Search\Extensions\SearchUpdater_ObjectHandler
SearchUpdater_ObjectHandler: SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_ObjectHandler
SearchVariant: SilverStripe\FullTextSearch\Search\Variants\SearchVariant SearchVariant: SilverStripe\FullTextSearch\Search\Variants\SearchVariant
SearchVariant_Caller: SilverStripe\FullTextSearch\Search\Variants\SearchVariant_Caller SearchVariant_Caller: SilverStripe\FullTextSearch\Search\Variants\SearchVariant_Caller
SearchVariantSubsites: SilverStripe\FullTextSearch\Search\Variants\SearchVariantSubsites SearchVariantSubsites: SilverStripe\FullTextSearch\Search\Variants\SearchVariantSubsites

View File

@ -22,7 +22,11 @@ SilverStripe\Core\Injector\Injector:
--- ---
Name: fulltextsearchsqlite Name: fulltextsearchsqlite
After:
- 'sqlite3connectors'
--- ---
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
SQLite3PDODatabase:
class: SilverStripe\FullTextSearch\Search\Captures\SearchManipulateCapture_SQLite3Database
SQLite3Database: SQLite3Database:
class: SilverStripe\FullTextSearch\Search\Captures\SearchManipulateCapture_SQLite3Database class: SilverStripe\FullTextSearch\Search\Captures\SearchManipulateCapture_SQLite3Database

View File

@ -2,10 +2,10 @@
namespace SilverStripe\FullTextSearch\Search\Captures; namespace SilverStripe\FullTextSearch\Search\Captures;
use SilverStripe\SQLite\SQLite3Database;
use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater;
use SilverStripe\SQLite\SQLite3Database;
if (!class_exists('SQLite3Database')) { if (!class_exists(SQLite3Database::class)) {
return; return;
} }