Update dbstore

clevergo · Jun 17, 2020 · 9f750b9 · 9f750b9
1 parent 8060907
commit 9f750b9
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 110 deletions.
diff --git a/stores/dbstore/dialect.go b/stores/dbstore/dialect.go
diff --git a/stores/dbstore/dialect_test.go b/stores/dbstore/dialect_test.go
diff --git a/stores/dbstore/go.mod b/stores/dbstore/go.mod
@@ -2,4 +2,7 @@ module clevergo.tech/captchas/stores/dbstore
 
 go 1.14
 
-require clevergo.tech/captchas v0.1.0
+require (
+	clevergo.tech/captchas v0.1.0
+	github.com/doug-martin/goqu/v9 v9.9.0
+)
diff --git a/stores/dbstore/go.sum b/stores/dbstore/go.sum
@@ -0,0 +1,44 @@
+clevergo.tech/captchas v0.1.0 h1:ChR82wrJz/8aarkyxFg/gXH9ysBBaBZZZBXQgVu2xSo=
+clevergo.tech/captchas v0.1.0/go.mod h1:PbpBsWyXUc4UJJl+/Nn4YStY8kFnYFt6tw3gwcRemVo=
+github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08=
+github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+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=
+github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/doug-martin/goqu/v9 v9.9.0 h1:dF0Wcn6O/ccuK0w8U62Wa0HQskWOgex8IjyPBzujzNg=
+github.com/doug-martin/goqu/v9 v9.9.0/go.mod h1:zx5/YoiHux3wn7477GnI3PXzKyKpLKu32Teo9U4yCFE=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q=
+github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+google.golang.org/appengine v1.6.2 h1:j8RI1yW0SkI+paT6uGwMlrMI/6zwYA6/CFil8rxOzGI=
+google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/stores/dbstore/store.go b/stores/dbstore/store.go
@@ -5,11 +5,13 @@
 package dbstore
 
 import (
+	"context"
 	"database/sql"
-	"fmt"
+	"log"
 	"time"
 
 	"clevergo.tech/captchas"
+	"github.com/doug-martin/goqu/v9"
 )
 
 type item struct {
@@ -54,15 +56,17 @@ func TableName(name string) Option {
 // Store is a database store.
 type Store struct {
 	db         *sql.DB
-	dialect    Dialect
+	dialect    goqu.DialectWrapper
 	tableName  string
 	category   string
 	expiration time.Duration
 	gcInterval time.Duration
 }
 
+var _ captchas.Store = New(nil, goqu.DialectWrapper{})
+
 // New returns a db store.
-func New(db *sql.DB, dialect Dialect, opts ...Option) *Store {
+func New(db *sql.DB, dialect goqu.DialectWrapper, opts ...Option) *Store {
 	s := &Store{
 		db:         db,
 		dialect:    dialect,
@@ -82,17 +86,17 @@ func New(db *sql.DB, dialect Dialect, opts ...Option) *Store {
 }
 
 // Get implements Store.Get.
-func (s *Store) Get(id string, clear bool) (string, error) {
-	stat := fmt.Sprintf(
-		"SELECT %s, %s, %s FROM %s WHERE id=%s AND category=%s",
-		s.dialect.Quote("id"),
-		s.dialect.Quote("answer"),
-		s.dialect.Quote("expires_in"),
-		s.dialect.Quote(s.tableName),
-		s.dialect.BindVar(1),
-		s.dialect.BindVar(2),
-	)
-	row := s.db.QueryRow(stat, id, s.category)
+func (s *Store) Get(ctx context.Context, id string, clear bool) (string, error) {
+	query, args, err := s.dialect.From(s.tableName).
+		Select("id", "answer", "expires_in").
+		Where(goqu.Ex{
+			"id":       id,
+			"category": s.category,
+		}).ToSQL()
+	if err != nil {
+		return "", err
+	}
+	row := s.db.QueryRowContext(ctx, query, args...)
 	if row == nil {
 		return "", captchas.ErrCaptchaIncorrect
 	}
@@ -108,39 +112,38 @@ func (s *Store) Get(id string, clear bool) (string, error) {
 	}
 
 	if clear {
-		stat := fmt.Sprintf(
-			"DELETE FROM %s WHERE id=%s AND category=%s",
-			s.dialect.Quote(s.tableName),
-			s.dialect.BindVar(1),
-			s.dialect.BindVar(2),
-		)
-		_, err := s.db.Exec(stat, id, s.category)
+		query, args, err = s.dialect.Delete(s.tableName).
+			Where(goqu.Ex{
+				"id":       id,
+				"category": s.category,
+			}).ToSQL()
 		if err != nil {
 			return "", err
 		}
+		if _, err := s.db.ExecContext(ctx, query, args...); err != nil {
+			return "", err
+		}
 	}
 
 	return item.Answer, nil
 }
 
 // Set implements Store.Set.
-func (s *Store) Set(id, answer string) error {
+func (s *Store) Set(ctx context.Context, id, answer string) error {
 	now := time.Now()
-	stat := fmt.Sprintf(
-		"INSERT INTO %s(%s, %s, %s, %s, %s) VALUES(%s, %s, %s, %s, %s)",
-		s.dialect.Quote(s.tableName),
-		s.dialect.Quote("id"),
-		s.dialect.Quote("category"),
-		s.dialect.Quote("answer"),
-		s.dialect.Quote("created_at"),
-		s.dialect.Quote("expires_in"),
-		s.dialect.BindVar(1),
-		s.dialect.BindVar(2),
-		s.dialect.BindVar(3),
-		s.dialect.BindVar(4),
-		s.dialect.BindVar(5),
-	)
-	_, err := s.db.Exec(stat, id, s.category, answer, now.Unix(), now.Add(s.expiration).Unix())
+	query, args, err := s.dialect.Insert(s.tableName).Rows(
+		goqu.Record{
+			"id":         id,
+			"category":   s.category,
+			"answer":     answer,
+			"created_at": now.Unix(),
+			"expires_in": now.Add(s.expiration).Unix(),
+		},
+	).ToSQL()
+	if err != nil {
+		return err
+	}
+	_, err = s.db.ExecContext(ctx, query, args...)
 	return err
 }
 
@@ -155,11 +158,16 @@ func (s *Store) gc() {
 }
 
 func (s *Store) deleteExpired() {
-	stat := fmt.Sprintf(
-		"DELETE FROM %s WHERE category=%s AND expires_in<%s",
-		s.dialect.Quote(s.tableName),
-		s.dialect.BindVar(1),
-		s.dialect.BindVar(2),
-	)
-	s.db.Exec(stat, s.category, time.Now().Unix())
+	query, args, err := s.dialect.Delete(s.tableName).Where(
+		goqu.Ex{
+			"category":   s.category,
+			"expires_in": goqu.Op{"lt": time.Now().Unix()},
+		},
+	).ToSQL()
+	if err != nil {
+		log.Println(err)
+	}
+	if _, err := s.db.Exec(query, args...); err != nil {
+		log.Println(err)
+	}
 }