summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
Diffstat (limited to 'store')
-rw-r--r--store/sql_preference_store.go2
-rw-r--r--store/sql_session_store.go2
-rw-r--r--store/sql_store.go2
-rw-r--r--store/sql_user_store.go2
-rw-r--r--store/store.go2
5 files changed, 6 insertions, 4 deletions
diff --git a/store/sql_preference_store.go b/store/sql_preference_store.go
index 307761150..6302d2f4f 100644
--- a/store/sql_preference_store.go
+++ b/store/sql_preference_store.go
@@ -4,7 +4,7 @@
package store
import (
- l4g "code.google.com/p/log4go"
+ l4g "github.com/alecthomas/log4go"
"github.com/go-gorp/gorp"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
diff --git a/store/sql_session_store.go b/store/sql_session_store.go
index 86604b4fe..6b0a31443 100644
--- a/store/sql_session_store.go
+++ b/store/sql_session_store.go
@@ -4,7 +4,7 @@
package store
import (
- l4g "code.google.com/p/log4go"
+ l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
diff --git a/store/sql_store.go b/store/sql_store.go
index d17a3e8c3..d0471fa1e 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -4,7 +4,6 @@
package store
import (
- l4g "code.google.com/p/log4go"
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
@@ -16,6 +15,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ l4g "github.com/alecthomas/log4go"
"io"
sqltrace "log"
"math/rand"
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index 32332ad92..0f73f73c3 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -37,6 +37,7 @@ func NewSqlUserStore(sqlStore *SqlStore) UserStore {
table.ColMap("Props").SetMaxSize(4000)
table.ColMap("NotifyProps").SetMaxSize(2000)
table.ColMap("ThemeProps").SetMaxSize(2000)
+ table.ColMap("Locale").SetMaxSize(5)
table.SetUniqueTogether("Email", "TeamId")
table.SetUniqueTogether("Username", "TeamId")
}
@@ -45,6 +46,7 @@ func NewSqlUserStore(sqlStore *SqlStore) UserStore {
}
func (us SqlUserStore) UpgradeSchemaIfNeeded() {
+ us.CreateColumnIfNotExists("Users", "Locale", "varchar(5)", "character varying(5)", model.DEFAULT_LOCALE) // Added After 1.4
}
func (us SqlUserStore) CreateIndexesIfNotExists() {
diff --git a/store/store.go b/store/store.go
index 8e03c8ee7..179cfecd7 100644
--- a/store/store.go
+++ b/store/store.go
@@ -4,7 +4,7 @@
package store
import (
- l4g "code.google.com/p/log4go"
+ l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"time"
)