|
|
@@ -87,7 +87,8 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
default_reading_speed,
|
|
|
- cjk_reading_speed
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page
|
|
|
`
|
|
|
|
|
|
tx, err := s.db.Begin()
|
|
|
@@ -122,6 +123,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
|
|
&user.EntryOrder,
|
|
|
&user.DefaultReadingSpeed,
|
|
|
&user.CJKReadingSpeed,
|
|
|
+ &user.DefaultHomePage,
|
|
|
)
|
|
|
if err != nil {
|
|
|
tx.Rollback()
|
|
|
@@ -174,9 +176,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
display_mode=$15,
|
|
|
entry_order=$16,
|
|
|
default_reading_speed=$17,
|
|
|
- cjk_reading_speed=$18
|
|
|
+ cjk_reading_speed=$18,
|
|
|
+ default_home_page=$19
|
|
|
WHERE
|
|
|
- id=$19
|
|
|
+ id=$20
|
|
|
`
|
|
|
|
|
|
_, err = s.db.Exec(
|
|
|
@@ -199,6 +202,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
user.EntryOrder,
|
|
|
user.DefaultReadingSpeed,
|
|
|
user.CJKReadingSpeed,
|
|
|
+ user.DefaultHomePage,
|
|
|
user.ID,
|
|
|
)
|
|
|
if err != nil {
|
|
|
@@ -223,9 +227,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
display_mode=$14,
|
|
|
entry_order=$15,
|
|
|
default_reading_speed=$16,
|
|
|
- cjk_reading_speed=$17
|
|
|
+ cjk_reading_speed=$17,
|
|
|
+ default_home_page=$18
|
|
|
WHERE
|
|
|
- id=$18
|
|
|
+ id=$19
|
|
|
`
|
|
|
|
|
|
_, err := s.db.Exec(
|
|
|
@@ -247,6 +252,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
user.EntryOrder,
|
|
|
user.DefaultReadingSpeed,
|
|
|
user.CJKReadingSpeed,
|
|
|
+ user.DefaultHomePage,
|
|
|
user.ID,
|
|
|
)
|
|
|
|
|
|
@@ -290,7 +296,8 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
default_reading_speed,
|
|
|
- cjk_reading_speed
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -321,7 +328,8 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
default_reading_speed,
|
|
|
- cjk_reading_speed
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -352,7 +360,8 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
default_reading_speed,
|
|
|
- cjk_reading_speed
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -390,7 +399,8 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
|
|
|
u.display_mode,
|
|
|
u.entry_order,
|
|
|
u.default_reading_speed,
|
|
|
- u.cjk_reading_speed
|
|
|
+ u.cjk_reading_speed,
|
|
|
+ u.default_home_page
|
|
|
FROM
|
|
|
users u
|
|
|
LEFT JOIN
|
|
|
@@ -423,6 +433,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
|
|
|
&user.EntryOrder,
|
|
|
&user.DefaultReadingSpeed,
|
|
|
&user.CJKReadingSpeed,
|
|
|
+ &user.DefaultHomePage,
|
|
|
)
|
|
|
|
|
|
if err == sql.ErrNoRows {
|
|
|
@@ -516,7 +527,8 @@ func (s *Storage) Users() (model.Users, error) {
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
default_reading_speed,
|
|
|
- cjk_reading_speed
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page
|
|
|
FROM
|
|
|
users
|
|
|
ORDER BY username ASC
|
|
|
@@ -550,6 +562,7 @@ func (s *Storage) Users() (model.Users, error) {
|
|
|
&user.EntryOrder,
|
|
|
&user.DefaultReadingSpeed,
|
|
|
&user.CJKReadingSpeed,
|
|
|
+ &user.DefaultHomePage,
|
|
|
)
|
|
|
|
|
|
if err != nil {
|