oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-06-27 16:36:00 +00:00
Code Wiki Activity

Rename column to CategoriesSortingOrder

Browse source
This commit is contained in:
Frédéric Guillot 2022-10-25 20:00:56 -07:00
parent 83e1f154b5
commit 206be5ba15
26 changed files with 178 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

26
storage/user.go
View file

@ -89,7 +89,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
default_reading_speed,
cjk_reading_speed,
default_home_page,
categories_sort_order
categories_sorting_order
`
tx, err := s.db.Begin()
@ -125,7 +125,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
&user.DefaultHomePage,
&user.CategoriesSortOrder,
&user.CategoriesSortingOrder,
)
if err != nil {
tx.Rollback()
@ -180,7 +180,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
default_reading_speed=$17,
cjk_reading_speed=$18,
default_home_page=$19,
categories_sort_order=$20
categories_sorting_order=$20
WHERE
id=$21
`
@ -206,7 +206,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
user.DefaultReadingSpeed,
user.CJKReadingSpeed,
user.DefaultHomePage,
user.CategoriesSortOrder,
user.CategoriesSortingOrder,
user.ID,
)
if err != nil {
@ -233,7 +233,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
default_reading_speed=$16,
cjk_reading_speed=$17,
default_home_page=$18,
categories_sort_order=$19
categories_sorting_order=$19
WHERE
id=$20
`
@ -258,7 +258,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
user.DefaultReadingSpeed,
user.CJKReadingSpeed,
user.DefaultHomePage,
user.CategoriesSortOrder,
user.CategoriesSortingOrder,
user.ID,
)
@ -304,7 +304,7 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
default_reading_speed,
cjk_reading_speed,
default_home_page,
categories_sort_order
categories_sorting_order
FROM
users
WHERE
@ -337,7 +337,7 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
default_reading_speed,
cjk_reading_speed,
default_home_page,
categories_sort_order
categories_sorting_order
FROM
users
WHERE
@ -370,7 +370,7 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
default_reading_speed,
cjk_reading_speed,
default_home_page,
categories_sort_order
categories_sorting_order
FROM
users
WHERE
@ -410,7 +410,7 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
u.default_reading_speed,
u.cjk_reading_speed,
u.default_home_page,
u.categories_sort_order
u.categories_sorting_order
FROM
users u
LEFT JOIN
@ -444,7 +444,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
&user.DefaultHomePage,
&user.CategoriesSortOrder,
&user.CategoriesSortingOrder,
)
if err == sql.ErrNoRows {
@ -540,7 +540,7 @@ func (s *Storage) Users() (model.Users, error) {
default_reading_speed,
cjk_reading_speed,
default_home_page,
categories_sort_order
categories_sorting_order
FROM
users
ORDER BY username ASC
@ -575,7 +575,7 @@ func (s *Storage) Users() (model.Users, error) {
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
&user.DefaultHomePage,
&user.CategoriesSortOrder,
&user.CategoriesSortingOrder,
)
if err != nil {