diff options
| author | Joe Chen <jc@unknwon.io> | 2022-06-12 14:15:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 14:15:01 +0800 |
| commit | b772603d78cb10f0501f3d08b01553bb33914b6e (patch) | |
| tree | 5f160df17f1bbd357370b3aeeb5289b0a5c3c08d /internal/db/models.go | |
| parent | 2e19f5a3c8193776685a5e9fea9ca8663f14dd8d (diff) | |
migrations: add tests and remove XORM (#7050)
Diffstat (limited to 'internal/db/models.go')
| -rw-r--r-- | internal/db/models.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/db/models.go b/internal/db/models.go index f0e4d564..d892aeb3 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -89,14 +89,14 @@ func getEngine() (*xorm.Engine, error) { case "postgres": conf.UsePostgreSQL = true - host, port := parsePostgreSQLHostPort(conf.Database.Host) + host, port := dbutil.ParsePostgreSQLHostPort(conf.Database.Host) connStr = fmt.Sprintf("user='%s' password='%s' host='%s' port='%s' dbname='%s' sslmode='%s' search_path='%s'", conf.Database.User, conf.Database.Password, host, port, conf.Database.Name, conf.Database.SSLMode, conf.Database.Schema) driver = "pgx" case "mssql": conf.UseMSSQL = true - host, port := parseMSSQLHostPort(conf.Database.Host) + host, port := dbutil.ParseMSSQLHostPort(conf.Database.Host) connStr = fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, conf.Database.Name, conf.Database.User, conf.Database.Password) case "sqlite3": @@ -187,7 +187,7 @@ func NewEngine() (err error) { return err } - if err = migrations.Migrate(x, db); err != nil { + if err = migrations.Migrate(db); err != nil { return fmt.Errorf("migrate: %v", err) } |