diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-27 10:55:03 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-27 10:55:03 -0400 |
commit | 9a87bb3af68216b53ee8f89d6604c715c7b85b2d (patch) | |
tree | 8c06aed890f388b228f3aefb8e398309bc73c0b9 /store/sql_store.go | |
parent | 0e007e344bf10993529711f14c4168365c3504c3 (diff) | |
download | chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.gz chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.bz2 chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.zip |
Creating common token store and moving email invites and verification to it (#6213)
Diffstat (limited to 'store/sql_store.go')
-rw-r--r-- | store/sql_store.go | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/store/sql_store.go b/store/sql_store.go index 466042ca2..0d921d07d 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -62,6 +62,7 @@ const ( EXIT_REMOVE_INDEX_POSTGRES = 121 EXIT_REMOVE_INDEX_MYSQL = 122 EXIT_REMOVE_INDEX_MISSING = 123 + EXIT_REMOVE_TABLE = 134 ) type SqlStore struct { @@ -80,7 +81,7 @@ type SqlStore struct { command CommandStore preference PreferenceStore license LicenseStore - recovery PasswordRecoveryStore + token TokenStore emoji EmojiStore status StatusStore fileInfo FileInfoStore @@ -131,7 +132,7 @@ func NewSqlStore() Store { sqlStore.command = NewSqlCommandStore(sqlStore) sqlStore.preference = NewSqlPreferenceStore(sqlStore) sqlStore.license = NewSqlLicenseStore(sqlStore) - sqlStore.recovery = NewSqlPasswordRecoveryStore(sqlStore) + sqlStore.token = NewSqlTokenStore(sqlStore) sqlStore.emoji = NewSqlEmojiStore(sqlStore) sqlStore.status = NewSqlStatusStore(sqlStore) sqlStore.fileInfo = NewSqlFileInfoStore(sqlStore) @@ -159,7 +160,7 @@ func NewSqlStore() Store { sqlStore.command.(*SqlCommandStore).CreateIndexesIfNotExists() sqlStore.preference.(*SqlPreferenceStore).CreateIndexesIfNotExists() sqlStore.license.(*SqlLicenseStore).CreateIndexesIfNotExists() - sqlStore.recovery.(*SqlPasswordRecoveryStore).CreateIndexesIfNotExists() + sqlStore.token.(*SqlTokenStore).CreateIndexesIfNotExists() sqlStore.emoji.(*SqlEmojiStore).CreateIndexesIfNotExists() sqlStore.status.(*SqlStatusStore).CreateIndexesIfNotExists() sqlStore.fileInfo.(*SqlFileInfoStore).CreateIndexesIfNotExists() @@ -388,7 +389,7 @@ func (ss *SqlStore) RemoveColumnIfExists(tableName string, columnName string) bo _, err := ss.GetMaster().Exec("ALTER TABLE " + tableName + " DROP COLUMN " + columnName) if err != nil { - l4g.Critical(utils.T("store.sql.drop_column.critical"), err) + l4g.Critical("Failed to drop column %v", err) time.Sleep(time.Second) os.Exit(EXIT_REMOVE_COLUMN) } @@ -396,6 +397,21 @@ func (ss *SqlStore) RemoveColumnIfExists(tableName string, columnName string) bo return true } +func (ss *SqlStore) RemoveTableIfExists(tableName string) bool { + if !ss.DoesTableExist(tableName) { + return false + } + + _, err := ss.GetMaster().Exec("DROP TABLE " + tableName) + if err != nil { + l4g.Critical("Failed to drop table %v", err) + time.Sleep(time.Second) + os.Exit(EXIT_REMOVE_TABLE) + } + + return true +} + func (ss *SqlStore) RenameColumnIfExists(tableName string, oldColumnName string, newColumnName string, colType string) bool { if !ss.DoesColumnExist(tableName, oldColumnName) { return false @@ -667,8 +683,8 @@ func (ss *SqlStore) License() LicenseStore { return ss.license } -func (ss *SqlStore) PasswordRecovery() PasswordRecoveryStore { - return ss.recovery +func (ss *SqlStore) Token() TokenStore { + return ss.token } func (ss *SqlStore) Emoji() EmojiStore { |