Skip to content

Commit 9e483d9

Browse files
committed
feat: adapt postgres (close AlistGo#740)
1 parent 801f843 commit 9e483d9

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

model/account.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func GetAccountById(id uint) (*Account, error) {
159159
func GetAccountFiles() ([]File, error) {
160160
files := make([]File, 0)
161161
var accounts []Account
162-
if err := conf.DB.Order("`index`").Find(&accounts).Error; err != nil {
162+
if err := conf.DB.Order(columnName("index")).Find(&accounts).Error; err != nil {
163163
return nil, err
164164
}
165165
for _, v := range accounts {
@@ -179,7 +179,7 @@ func GetAccountFiles() ([]File, error) {
179179

180180
func GetAccounts() ([]Account, error) {
181181
var accounts []Account
182-
if err := conf.DB.Order("`index`").Find(&accounts).Error; err != nil {
182+
if err := conf.DB.Order(columnName("index")).Find(&accounts).Error; err != nil {
183183
return nil, err
184184
}
185185
return accounts, nil

model/setting.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ func SaveSetting(item SettingItem) error {
5050

5151
func GetSettingsPublic() ([]SettingItem, error) {
5252
var items []SettingItem
53-
if err := conf.DB.Where("`access` <> ?", 1).Find(&items).Error; err != nil {
53+
if err := conf.DB.Where(fmt.Sprintf("%s <> ?", columnName("access")), 1).Find(&items).Error; err != nil {
5454
return nil, err
5555
}
5656
return items, nil
5757
}
5858

5959
func GetSettingsByGroup(group int) ([]SettingItem, error) {
6060
var items []SettingItem
61-
if err := conf.DB.Where("`group` = ?", group).Find(&items).Error; err != nil {
61+
if err := conf.DB.Where(fmt.Sprintf("%s = ?", columnName("group")), group).Find(&items).Error; err != nil {
6262
return nil, err
6363
}
6464
items = append([]SettingItem{Version}, items...)
@@ -82,7 +82,7 @@ func DeleteSetting(key string) error {
8282

8383
func GetSettingByKey(key string) (*SettingItem, error) {
8484
var items SettingItem
85-
if err := conf.DB.Where("`key` = ?", key).First(&items).Error; err != nil {
85+
if err := conf.DB.Where(fmt.Sprintf("%s = ?", columnName("key")), key).First(&items).Error; err != nil {
8686
return nil, err
8787
}
8888
return &items, nil

model/util.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package model
2+
3+
import (
4+
"fmt"
5+
"github.com/Xhofe/alist/conf"
6+
)
7+
8+
func columnName(name string) string {
9+
if conf.Conf.Database.Type == "postgres" {
10+
return fmt.Sprintf(`"%s"`, name)
11+
}
12+
return fmt.Sprintf("`%s`", name)
13+
}

0 commit comments

Comments
 (0)