From 6f9e8ae17a789f06eee38ed188e7295b1c3fa3d3 Mon Sep 17 00:00:00 2001 From: Robin Joseph Date: Thu, 23 Aug 2018 19:31:07 -0700 Subject: [PATCH] fix(setup): Use `*pg.DB.CreateTable` for a consistent interface --- setup.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.go b/setup.go index 8985e89..bb7c939 100644 --- a/setup.go +++ b/setup.go @@ -1,8 +1,11 @@ package migrations -import "github.com/go-pg/pg/orm" +import ( + "github.com/go-pg/pg" + "github.com/go-pg/pg/orm" +) -func ensureMigrationTables(db orm.DB) error { +func ensureMigrationTables(db *pg.DB) error { exists, err := checkIfTableExists("migrations", db) if err != nil { return err @@ -52,8 +55,7 @@ func checkIfTableExists(name string, db orm.DB) (bool, error) { return count > 0, nil } -func createTable(model interface{}, db orm.DB) error { +func createTable(model interface{}, db *pg.DB) error { opts := orm.CreateTableOptions{IfNotExists: true} - _, err := orm.CreateTable(db, model, &opts) - return err + return db.CreateTable(model, &opts) }