diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-06-21 16:50:35 +0200 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-06-21 16:50:35 +0200 |
commit | 0d741301a379f3de159226880b3c86301fe19b1a (patch) | |
tree | aec8cdb043f089db3d477b36e0a11b56e370b953 | |
parent | 07c785e294e70494ae6016d59749a71af3f74920 (diff) | |
download | chat-0d741301a379f3de159226880b3c86301fe19b1a.tar.gz chat-0d741301a379f3de159226880b3c86301fe19b1a.tar.bz2 chat-0d741301a379f3de159226880b3c86301fe19b1a.zip |
fix typo in en.json and remove trailing spaces (#8975)
-rw-r--r-- | i18n/en.json | 2 | ||||
-rw-r--r-- | store/sqlstore/cluster_discovery_store.go | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/i18n/en.json b/i18n/en.json index 7e880b3c4..3425e785c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6428,7 +6428,7 @@ }, { "id": "store.sql_cluster_discovery.get_all.app_error", - "translation": "Failed to get all disoery rows" + "translation": "Failed to get all discovery rows" }, { "id": "store.sql_cluster_discovery.set_last_ping.app_error", diff --git a/store/sqlstore/cluster_discovery_store.go b/store/sqlstore/cluster_discovery_store.go index 14810cadb..6ac49199e 100644 --- a/store/sqlstore/cluster_discovery_store.go +++ b/store/sqlstore/cluster_discovery_store.go @@ -47,7 +47,7 @@ func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscover if count, err := s.GetMaster().SelectInt( ` - DELETE + DELETE FROM ClusterDiscovery WHERE @@ -76,7 +76,7 @@ func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscover if count, err := s.GetMaster().SelectInt( ` - SELECT + SELECT COUNT(*) FROM ClusterDiscovery @@ -108,7 +108,7 @@ func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName strin if _, err := s.GetMaster().Select( &list, ` - SELECT + SELECT * FROM ClusterDiscovery @@ -134,8 +134,8 @@ func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterD return store.Do(func(result *store.StoreResult) { if _, err := s.GetMaster().Exec( ` - UPDATE ClusterDiscovery - SET + UPDATE ClusterDiscovery + SET LastPingAt = :LastPingAt WHERE Type = :Type @@ -158,7 +158,7 @@ func (s sqlClusterDiscoveryStore) Cleanup() store.StoreChannel { return store.Do(func(result *store.StoreResult) { if _, err := s.GetMaster().Exec( ` - DELETE FROM ClusterDiscovery + DELETE FROM ClusterDiscovery WHERE LastPingAt < :LastPingAt `, |