Fix: change sql driver for bun

Author: aopoltorzhicky

database/bun.go

@@ -10,7 +10,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 	"github.com/uptrace/bun/dialect/pgdialect"
-	"github.com/uptrace/bun/driver/pgdriver"
 )
 
 // Bun -
@@ -35,16 +34,26 @@ func (db *Bun) Connect(ctx context.Context, cfg config.Database) error {
 		return errors.Wrap(ErrUnsupportedDatabaseType, cfg.Kind)
 	}
 	if cfg.Path != "" {
-		db.sqldb = sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(cfg.Path)))
+		conn, err := sql.Open("postgres", cfg.Path)
+		if err != nil {
+			return err
+		}
+		db.sqldb = conn
 		db.conn = bun.NewDB(db.sqldb, pgdialect.New())
 	} else {
-		db.sqldb = sql.OpenDB(pgdriver.NewConnector(
-			pgdriver.WithAddr(fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)),
-			pgdriver.WithDatabase(cfg.Database),
-			pgdriver.WithPassword(cfg.Password),
-			pgdriver.WithUser(cfg.User),
-			pgdriver.WithInsecure(true),
-		))
+		connStr := fmt.Sprintf(
+			"postgres://%s:%s@%s:%d/%s?sslmode=disable",
+			cfg.User,
+			cfg.Password,
+			cfg.Host,
+			cfg.Port,
+			cfg.Database,
+		)
+		conn, err := sql.Open("postgres", connStr)
+		if err != nil {
+			return err
+		}
+		db.sqldb = conn
 		db.conn = bun.NewDB(db.sqldb, pgdialect.New())
 	}
 	maxOpenConns := 4 * runtime.GOMAXPROCS(0)

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/tidwall/gjson v1.16.0
 	github.com/uptrace/bun v1.1.14
 	github.com/uptrace/bun/dialect/pgdialect v1.1.14
-	github.com/uptrace/bun/driver/pgdriver v1.1.14
 	github.com/yhirose/go-peg v0.0.0-20210804202551-de25d6753cf1
 	golang.org/x/crypto v0.12.0
 	golang.org/x/text v0.12.0

go.sum

@@ -271,8 +271,6 @@ github.com/uptrace/bun v1.1.14 h1:S5vvNnjEynJ0CvnrBOD7MIRW7q/WbtvFXrdfy0lddAM=
 github.com/uptrace/bun v1.1.14/go.mod h1:RHk6DrIisO62dv10pUOJCz5MphXThuOTpVNYEYv7NI8=
 github.com/uptrace/bun/dialect/pgdialect v1.1.14 h1:b7+V1KDJPQSFYgkG/6YLXCl2uvwEY3kf/GSM7hTHRDY=
 github.com/uptrace/bun/dialect/pgdialect v1.1.14/go.mod h1:v6YiaXmnKQ2FlhRD2c0ZfKd+QXH09pYn4H8ojaavkKk=
-github.com/uptrace/bun/driver/pgdriver v1.1.14 h1:V2Etm7mLGS3mhx8ddxZcUnwZLX02Jmq9JTlo0sNVDhA=
-github.com/uptrace/bun/driver/pgdriver v1.1.14/go.mod h1:D4FjWV9arDYct6sjMJhFoyU71SpllZRHXFRRP2Kd0Kw=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=