Update pgx with new tests package

cristalhq · Jul 6, 2022 · 6d16391 · 6d16391
1 parent 7a3d79c
commit 6d16391
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 480 deletions.
diff --git a/dbump_pgx/go.mod b/dbump_pgx/go.mod
@@ -3,6 +3,6 @@ module github.com/cristalhq/dbump/dbump_pgx
 go 1.16
 
 require (
-	github.com/cristalhq/dbump v0.11.0
+	github.com/cristalhq/dbump v0.12.0
 	github.com/jackc/pgx/v4 v4.16.1
 )
diff --git a/dbump_pgx/go.sum b/dbump_pgx/go.sum
@@ -5,8 +5,8 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
-github.com/cristalhq/dbump v0.11.0 h1:PhPRtOh2j/HXPabmeVv27bnIz0pMR9g/4OKHDIz/oWo=
-github.com/cristalhq/dbump v0.11.0/go.mod h1:rAjULuStbuNPCLrJT62Eu7Sp/2gVt/4URUvsnPK1yFA=
+github.com/cristalhq/dbump v0.12.0 h1:hu4oKPyYbPYBfUJ5BbopFEKNcr5szKqAOzA97xwXJQA=
+github.com/cristalhq/dbump v0.12.0/go.mod h1:rAjULuStbuNPCLrJT62Eu7Sp/2gVt/4URUvsnPK1yFA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/dbump_pgx/pgx.go b/dbump_pgx/pgx.go
@@ -25,22 +25,22 @@ type Config struct {
 	// Table for the dbump version table. Default is empty which means "_dbump_log" table.
 	Table string
 
-	// [schema].table
+	// [schema.]table
 	tableName string
 	// to prevent multiple migrations running at the same time
 	lockNum int64
 }
 
 // NewMigrator instantiates new Migrator.
 func NewMigrator(conn *pgx.Conn, cfg Config) *Migrator {
-	if cfg.Schema != "" {
-		cfg.tableName += cfg.Schema + "."
+	if cfg.Schema == "" {
+		cfg.Schema = "public"
 	}
 	if cfg.Table == "" {
 		cfg.Table = "_dbump_log"
 	}
 
-	cfg.tableName += cfg.Table
+	cfg.tableName = cfg.Schema + "." + cfg.Table
 	cfg.lockNum = hashTableName(cfg.tableName)
 
 	return &Migrator{
@@ -51,18 +51,28 @@ func NewMigrator(conn *pgx.Conn, cfg Config) *Migrator {
 
 // Init is a method from Migrator interface.
 func (pg *Migrator) Init(ctx context.Context) error {
-	query := fmt.Sprintf(`CREATE SCHEMA IF NOT EXISTS %s;
-CREATE TABLE IF NOT EXISTS %s (
+	var query string
+	if pg.cfg.Schema != "" {
+		query = fmt.Sprintf(`CREATE SCHEMA IF NOT EXISTS %s;`, pg.cfg.Schema)
+	}
+
+	query += fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s (
 	version    BIGINT NOT NULL,
 	created_at TIMESTAMP WITH TIME ZONE NOT NULL
-);`, pg.cfg.Schema, pg.cfg.tableName)
+);`, pg.cfg.tableName)
+
 	_, err := pg.conn.Exec(ctx, query)
 	return err
 }
 
 // Drop is a method from Migrator interface.
 func (pg *Migrator) Drop(ctx context.Context) error {
 	query := fmt.Sprintf(`DROP TABLE IF EXISTS %s;`, pg.cfg.tableName)
+
+	// TODO: probably should ignore error for this query
+	// if pg.cfg.Schema != "" {
+	// 	query = fmt.Sprintf(`DROP SCHEMA IF EXISTS %s RESTRICT;`, pg.cfg.Schema)
+	// }
 	_, err := pg.conn.Exec(ctx, query)
 	return err
 }