add back dialect to handle pgx correctly (#1376)
This commit is contained in:
parent
9d337bfb0e
commit
42ff269bc8
|
@ -7,6 +7,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"entgo.io/ent/dialect"
|
||||||
entsql "entgo.io/ent/dialect/sql"
|
entsql "entgo.io/ent/dialect/sql"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/csconfig"
|
"github.com/crowdsecurity/crowdsec/pkg/csconfig"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/database/ent"
|
"github.com/crowdsecurity/crowdsec/pkg/database/ent"
|
||||||
|
@ -27,7 +28,7 @@ type Client struct {
|
||||||
CanFlush bool
|
CanFlush bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func getEntDriver(dbtype string, dsn string, config *csconfig.DatabaseCfg) (*entsql.Driver, error) {
|
func getEntDriver(dbtype string, dbdialect string, dsn string, config *csconfig.DatabaseCfg) (*entsql.Driver, error) {
|
||||||
db, err := sql.Open(dbtype, dsn)
|
db, err := sql.Open(dbtype, dsn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -37,7 +38,7 @@ func getEntDriver(dbtype string, dsn string, config *csconfig.DatabaseCfg) (*ent
|
||||||
config.MaxOpenConns = types.IntPtr(csconfig.DEFAULT_MAX_OPEN_CONNS)
|
config.MaxOpenConns = types.IntPtr(csconfig.DEFAULT_MAX_OPEN_CONNS)
|
||||||
}
|
}
|
||||||
db.SetMaxOpenConns(*config.MaxOpenConns)
|
db.SetMaxOpenConns(*config.MaxOpenConns)
|
||||||
drv := entsql.OpenDB(dbtype, db)
|
drv := entsql.OpenDB(dbdialect, db)
|
||||||
return drv, nil
|
return drv, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,25 +76,25 @@ func NewClient(config *csconfig.DatabaseCfg) (*Client, error) {
|
||||||
return &Client{}, fmt.Errorf("unable to set perms on %s: %v", config.DbPath, err)
|
return &Client{}, fmt.Errorf("unable to set perms on %s: %v", config.DbPath, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
drv, err := getEntDriver("sqlite3", fmt.Sprintf("file:%s?_busy_timeout=100000&_fk=1", config.DbPath), config)
|
drv, err := getEntDriver("sqlite3", dialect.SQLite, fmt.Sprintf("file:%s?_busy_timeout=100000&_fk=1", config.DbPath), config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &Client{}, errors.Wrapf(err, "failed opening connection to sqlite: %v", config.DbPath)
|
return &Client{}, errors.Wrapf(err, "failed opening connection to sqlite: %v", config.DbPath)
|
||||||
}
|
}
|
||||||
client = ent.NewClient(ent.Driver(drv), entOpt)
|
client = ent.NewClient(ent.Driver(drv), entOpt)
|
||||||
case "mysql":
|
case "mysql":
|
||||||
drv, err := getEntDriver("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=True", config.User, config.Password, config.Host, config.Port, config.DbName), config)
|
drv, err := getEntDriver("mysql", dialect.MySQL, fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=True", config.User, config.Password, config.Host, config.Port, config.DbName), config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &Client{}, fmt.Errorf("failed opening connection to mysql: %v", err)
|
return &Client{}, fmt.Errorf("failed opening connection to mysql: %v", err)
|
||||||
}
|
}
|
||||||
client = ent.NewClient(ent.Driver(drv), entOpt)
|
client = ent.NewClient(ent.Driver(drv), entOpt)
|
||||||
case "postgres", "postgresql":
|
case "postgres", "postgresql":
|
||||||
drv, err := getEntDriver("postgres", fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=%s", config.Host, config.Port, config.User, config.DbName, config.Password, config.Sslmode), config)
|
drv, err := getEntDriver("postgres", dialect.Postgres, fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=%s", config.Host, config.Port, config.User, config.DbName, config.Password, config.Sslmode), config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &Client{}, fmt.Errorf("failed opening connection to postgresql: %v", err)
|
return &Client{}, fmt.Errorf("failed opening connection to postgresql: %v", err)
|
||||||
}
|
}
|
||||||
client = ent.NewClient(ent.Driver(drv), entOpt)
|
client = ent.NewClient(ent.Driver(drv), entOpt)
|
||||||
case "pgx":
|
case "pgx":
|
||||||
drv, err := getEntDriver("pgx", fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=%s", config.User, config.Password, config.Host, config.Port, config.DbName, config.Sslmode), config)
|
drv, err := getEntDriver("pgx", dialect.Postgres, fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=%s", config.User, config.Password, config.Host, config.Port, config.DbName, config.Sslmode), config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &Client{}, fmt.Errorf("failed opening connection to pgx: %v", err)
|
return &Client{}, fmt.Errorf("failed opening connection to pgx: %v", err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue