From 801eac1bf5ebc0c33692c1b3edea9990bda84ca5 Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Mon, 12 Sep 2022 13:40:15 +0200 Subject: [PATCH] feat: use sqlx instead of sql --- database/legacy/v3/migrator.go | 2 +- database/postgresql/postgresql.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/database/legacy/v3/migrator.go b/database/legacy/v3/migrator.go index 3dfc6661..2ca4a0c5 100644 --- a/database/legacy/v3/migrator.go +++ b/database/legacy/v3/migrator.go @@ -16,6 +16,6 @@ type Migrator struct { func NewMigrator(db *postgresql.Database) *Migrator { return &Migrator{ - SQL: sqlx.NewDb(db.SQL, "postgres"), + SQL: db.SQL, } } diff --git a/database/postgresql/postgresql.go b/database/postgresql/postgresql.go index 9c205ef8..28be5c32 100644 --- a/database/postgresql/postgresql.go +++ b/database/postgresql/postgresql.go @@ -6,6 +6,8 @@ import ( "fmt" "strings" + "github.com/jmoiron/sqlx" + "github.com/forbole/juno/v3/logging" "github.com/cosmos/cosmos-sdk/simapp/params" @@ -39,7 +41,7 @@ func Builder(ctx *database.Context) (database.Database, error) { connStr += fmt.Sprintf(" password=%s", ctx.Cfg.Password) } - postgresDb, err := sql.Open("postgres", connStr) + postgresDb, err := sqlx.Open("postgres", connStr) if err != nil { return nil, err } @@ -61,7 +63,7 @@ var _ database.Database = &Database{} // Database defines a wrapper around a SQL database and implements functionality // for data aggregation and exporting. type Database struct { - SQL *sql.DB + SQL *sqlx.DB EncodingConfig *params.EncodingConfig Logger logging.Logger }