diff options
Diffstat (limited to 'store/sql_supplier.go')
| -rw-r--r-- | store/sql_supplier.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/store/sql_supplier.go b/store/sql_supplier.go index 0f4ab8380..df934f2cb 100644 --- a/store/sql_supplier.go +++ b/store/sql_supplier.go @@ -57,11 +57,6 @@ const ( EXIT_REMOVE_TABLE = 134 ) -type SqlSupplierResult struct { - Err model.AppError - Result interface{} -} - type SqlSupplierOldStores struct { team TeamStore channel ChannelStore @@ -86,6 +81,7 @@ type SqlSupplierOldStores struct { } type SqlSupplier struct { + next LayeredStoreSupplier master *gorp.DbMap replicas []*gorp.DbMap searchReplicas []*gorp.DbMap @@ -120,9 +116,10 @@ func NewSqlSupplier() *SqlSupplier { supplier.oldStores.emoji = NewSqlEmojiStore(supplier) supplier.oldStores.status = NewSqlStatusStore(supplier) supplier.oldStores.fileInfo = NewSqlFileInfoStore(supplier) - supplier.oldStores.reaction = NewSqlReactionStore(supplier) supplier.oldStores.job = NewSqlJobStore(supplier) + initSqlSupplierReactions(supplier) + err := supplier.GetMaster().CreateTablesIfNotExists() if err != nil { l4g.Critical(utils.T("store.sql.creating_tables.critical"), err) @@ -149,7 +146,6 @@ func NewSqlSupplier() *SqlSupplier { supplier.oldStores.emoji.(*SqlEmojiStore).CreateIndexesIfNotExists() supplier.oldStores.status.(*SqlStatusStore).CreateIndexesIfNotExists() supplier.oldStores.fileInfo.(*SqlFileInfoStore).CreateIndexesIfNotExists() - supplier.oldStores.reaction.(*SqlReactionStore).CreateIndexesIfNotExists() supplier.oldStores.job.(*SqlJobStore).CreateIndexesIfNotExists() supplier.oldStores.preference.(*SqlPreferenceStore).DeleteUnusedFeatures() @@ -157,6 +153,14 @@ func NewSqlSupplier() *SqlSupplier { return supplier } +func (s *SqlSupplier) SetChainNext(next LayeredStoreSupplier) { + s.next = next +} + +func (s *SqlSupplier) Next() LayeredStoreSupplier { + return s.next +} + func setupConnection(con_type string, driver string, dataSource string, maxIdle int, maxOpen int, trace bool) *gorp.DbMap { db, err := dbsql.Open(driver, dataSource) if err != nil { |