updates go-pg/pg to v7

database/admAccountStore.go

@@ -9,6 +9,7 @@ import (
 	"github.com/dhax/go-base/models"
 	"github.com/go-pg/pg"
 	"github.com/go-pg/pg/orm"
+	"github.com/go-pg/pg/urlvalues"
 )
 
 var (
@@ -30,33 +31,35 @@ func NewAdmAccountStore(db *pg.DB) *AdmAccountStore {
 
 // AccountFilter provides pagination and filtering options on accounts.
 type AccountFilter struct {
-	orm.Pager
-	Filters url.Values
-	Order   []string
+	Pager  *urlvalues.Pager
+	Filter *urlvalues.Filter
+	Order  []string
 }
 
-// Filter applies an AccountFilter on an orm.Query.
-func (f *AccountFilter) Filter(q *orm.Query) (*orm.Query, error) {
-	q = q.Apply(f.Pager.Paginate)
-	q = q.Apply(orm.URLFilters(f.Filters))
+// NewAccountFilter returns an AccountFilter with options parsed from request url values.
+func NewAccountFilter(params interface{}) (*AccountFilter, error) {
+	p := urlvalues.Values(params.(url.Values))
+	f := &AccountFilter{
+		Pager:  urlvalues.NewPager(p),
+		Filter: urlvalues.NewFilter(p),
+		Order:  p["order"],
+	}
+	return f, nil
+}
+
+// Apply applies an AccountFilter on an orm.Query.
+func (f *AccountFilter) Apply(q *orm.Query) (*orm.Query, error) {
+	q = q.Apply(f.Pager.Pagination)
+	q = q.Apply(f.Filter.Filters)
 	q = q.Order(f.Order...)
 	return q, nil
 }
 
-// NewAccountFilter returns an AccountFilter with options parsed from request url values.
-func NewAccountFilter(v url.Values) AccountFilter {
-	var f AccountFilter
-	f.SetURLValues(v)
-	f.Filters = v
-	f.Order = v["order"]
-	return f
-}
-
 // List applies a filter and returns paginated array of matching results and total count.
-func (s *AdmAccountStore) List(f AccountFilter) ([]pwdless.Account, int, error) {
+func (s *AdmAccountStore) List(f *AccountFilter) ([]pwdless.Account, int, error) {
 	a := []pwdless.Account{}
 	count, err := s.db.Model(&a).
-		Apply(f.Filter).
+		Apply(f.Apply).
 		SelectAndCount()
 	if err != nil {
 		return nil, 0, err

database/postgres.go

@@ -3,7 +3,6 @@ package database
 
 import (
 	"log"
-	"time"
 
 	"github.com/spf13/viper"
 
@@ -24,22 +23,26 @@ func DBConn() (*pg.DB, error) {
 	}
 
 	if viper.GetBool("db_debug") {
-		db.OnQueryProcessed(func(event *pg.QueryProcessedEvent) {
-			query, err := event.FormattedQuery()
-			if err != nil {
-				panic(err)
-			}
-			log.Printf("%s %s\n", time.Since(event.StartTime), query)
-		})
+		db.AddQueryHook(&logSQL{})
 	}
 
 	return db, nil
 }
 
+type logSQL struct{}
+
+func (l *logSQL) BeforeQuery(e *pg.QueryEvent) {}
+
+func (l *logSQL) AfterQuery(e *pg.QueryEvent) {
+	query, err := e.FormattedQuery()
+	if err != nil {
+		panic(err)
+	}
+	log.Println(query)
+}
+
 func checkConn(db *pg.DB) error {
 	var n int
-	if _, err := db.QueryOne(pg.Scan(&n), "SELECT 1"); err != nil {
-		return err
-	}
-	return nil
+	_, err := db.QueryOne(pg.Scan(&n), "SELECT 1")
+	return err
 }