llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add pg for db adapter (#50)

Browse Source 
Signed-off-by: Kininaru <shiftregister233@outlook.com>

fix: postgres creating failed

Signed-off-by: Kininaru <shiftregister233@outlook.com>

nil

Signed-off-by: Kininaru <shiftregister233@outlook.com>

rewrite postgres logic

Signed-off-by: Kininaru <shiftregister233@outlook.com>

removed pq from dependencies

Signed-off-by: Kininaru <shiftregister233@outlook.com>

comment pq

Signed-off-by: Kininaru <shiftregister233@outlook.com>

typo

Signed-off-by: Kininaru <shiftregister233@outlook.com>

comment

Signed-off-by: Kininaru <shiftregister233@outlook.com>
This commit is contained in:
Kininaru
2021-04-29 21:53:42 +08:00
committed by GitHub
parent 785f306c4b
commit 6dcece3990
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
object/adapter.go
View File

@ -19,7 +19,8 @@ import (
"runtime"
"github.com/astaxie/beego"
_ "github.com/go-sql-driver/mysql"
_ "github.com/go-sql-driver/mysql" // db = mysql
//_ "github.com/lib/pq" // db = postgres
"xorm.io/xorm"
)
@ -35,7 +36,7 @@ func InitConfig() {
}
func InitAdapter() {
adapter = NewAdapter("mysql", beego.AppConfig.String("dataSourceName"))
adapter = NewAdapter(beego.AppConfig.String("db"), beego.AppConfig.String("dataSourceName"))
}
// Adapter represents the MySQL adapter for policy storage.
@ -80,8 +81,10 @@ func (a *Adapter) createDatabase() error {
}
func (a *Adapter) open() {
if err := a.createDatabase(); err != nil {
panic(err)
if beego.AppConfig.String("db") != "postgres" {
if err := a.createDatabase(); err != nil {
panic(err)
}
}
engine, err := xorm.NewEngine(a.driverName, a.dataSourceName+beego.AppConfig.String("dbName"))