Merge pull request #10 from vgarvardt/patch/pgx-v4-support

Updated adapter to support pgx v4

Author: vgarvardt

.travis.yml

@@ -2,8 +2,8 @@ language: go
 sudo: false
 
 go:
-  - "1.11"
   - "1.12"
+  - "1.13"
   - "stable"
 
 services:

README.md

@@ -18,23 +18,23 @@ The store accepts an adapter interface that interacts with the DB. Adapter and i
 package main
 
 import (
+	"context"
 	"os"
 	"time"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	pg "github.com/vgarvardt/go-oauth2-pg"
-	"github.com/vgarvardt/go-pg-adapter/pgxadapter"
+	"github.com/vgarvardt/go-pg-adapter/pgx4adapter"
 	"gopkg.in/oauth2.v3/manage"
 )
 
 func main() {
-	pgxConnConfig, _ := pgx.ParseURI(os.Getenv("DB_URI"))
-	pgxConn, _ := pgx.Connect(pgxConnConfig)
+	pgxConn, _ := pgx.Connect(context.TODO(), os.Getenv("DB_URI"))
 
 	manager := manage.NewDefaultManager()
 
 	// use PostgreSQL token store with pgx.Connection adapter
-	adapter := pgxadapter.NewConn(pgxConn)
+	adapter := pgx4adapter.NewConn(pgxConn)
 	tokenStore, _ := pg.NewTokenStore(adapter, pg.WithTokenStoreGCInterval(time.Minute))
 	defer tokenStore.Close()
 

client_store.go

@@ -1,14 +1,16 @@
 package pg
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
 
 	"github.com/json-iterator/go"
-	"github.com/vgarvardt/go-pg-adapter"
 	"gopkg.in/oauth2.v3"
 	"gopkg.in/oauth2.v3/models"
+
+	"github.com/vgarvardt/go-pg-adapter"
 )
 
 // ClientStore PostgreSQL client store
@@ -53,7 +55,7 @@ func NewClientStore(adapter pgadapter.Adapter, options ...ClientStoreOption) (*C
 }
 
 func (s *ClientStore) initTable() error {
-	return s.adapter.Exec(fmt.Sprintf(`
+	return s.adapter.Exec(context.Background(), fmt.Sprintf(`
 CREATE TABLE IF NOT EXISTS %[1]s (
   id     TEXT  NOT NULL,
   secret TEXT  NOT NULL,
@@ -77,7 +79,7 @@ func (s *ClientStore) GetByID(id string) (oauth2.ClientInfo, error) {
 	}
 
 	var item ClientStoreItem
-	if err := s.adapter.SelectOne(&item, fmt.Sprintf("SELECT * FROM %s WHERE id = $1", s.tableName), id); err != nil {
+	if err := s.adapter.SelectOne(context.Background(), &item, fmt.Sprintf("SELECT * FROM %s WHERE id = $1", s.tableName), id); err != nil {
 		return nil, err
 	}
 
@@ -92,6 +94,7 @@ func (s *ClientStore) Create(info oauth2.ClientInfo) error {
 	}
 
 	return s.adapter.Exec(
+		context.Background(),
 		fmt.Sprintf("INSERT INTO %s (id, secret, domain, data) VALUES ($1, $2, $3, $4)", s.tableName),
 		info.GetID(),
 		info.GetSecret(),

client_store_test.go

@@ -5,18 +5,21 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
 func TestClientStore_initTable(t *testing.T) {
 	adapter := new(mockAdapter)
 
+	adapter.On("Exec", mock.Anything, mock.Anything, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+		query := args.Get(1).(string)
+		// new line character is the character at position 0
+		assert.Equal(t, 1, strings.Index(query, "CREATE TABLE IF NOT EXISTS"))
+	})
+
 	_, err := NewClientStore(adapter)
 	require.NoError(t, err)
 
-	assert.Equal(t, 1, len(adapter.execCalls))
-	assert.Equal(t, 0, len(adapter.selectOneCalls))
-
-	// new line character is the character at position 0
-	assert.Equal(t, 1, strings.Index(adapter.execCalls[0].query, "CREATE TABLE IF NOT EXISTS"))
+	adapter.AssertExpectations(t)
 }

go.mod

@@ -3,10 +3,10 @@ module github.com/vgarvardt/go-oauth2-pg
 go 1.12
 
 require (
-	github.com/jackc/pgx v3.6.0+incompatible
+	github.com/jackc/pgx/v4 v4.4.1
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/json-iterator/go v1.1.7
 	github.com/stretchr/testify v1.4.0
-	github.com/vgarvardt/go-pg-adapter v0.3.0
+	github.com/vgarvardt/go-pg-adapter v0.4.1
 	gopkg.in/oauth2.v3 v3.10.1
 )

go.sum

@@ -1,15 +1,17 @@
 package pg
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
 	"time"
 
 	"github.com/json-iterator/go"
-	"github.com/vgarvardt/go-pg-adapter"
 	"gopkg.in/oauth2.v3"
 	"gopkg.in/oauth2.v3/models"
+
+	"github.com/vgarvardt/go-pg-adapter"
 )
 
 // TokenStore PostgreSQL token store
@@ -81,7 +83,7 @@ func (s *TokenStore) gc() {
 }
 
 func (s *TokenStore) initTable() error {
-	return s.adapter.Exec(fmt.Sprintf(`
+	return s.adapter.Exec(context.Background(), fmt.Sprintf(`
 CREATE TABLE IF NOT EXISTS %[1]s (
   id         BIGSERIAL   NOT NULL,
   created_at TIMESTAMPTZ NOT NULL,
@@ -102,7 +104,7 @@ CREATE INDEX IF NOT EXISTS idx_%[1]s_refresh ON %[1]s (refresh);
 
 func (s *TokenStore) clean() {
 	now := time.Now()
-	err := s.adapter.Exec(fmt.Sprintf("DELETE FROM %s WHERE expires_at <= $1", s.tableName), now)
+	err := s.adapter.Exec(context.Background(), fmt.Sprintf("DELETE FROM %s WHERE expires_at <= $1", s.tableName), now)
 	if err != nil {
 		s.logger.Printf("Error while cleaning out outdated entities: %+v", err)
 	}
@@ -134,6 +136,7 @@ func (s *TokenStore) Create(info oauth2.TokenInfo) error {
 	}
 
 	return s.adapter.Exec(
+		context.Background(),
 		fmt.Sprintf("INSERT INTO %s (created_at, expires_at, code, access, refresh, data) VALUES ($1, $2, $3, $4, $5, $6)", s.tableName),
 		item.CreatedAt,
 		item.ExpiresAt,
@@ -146,7 +149,7 @@ func (s *TokenStore) Create(info oauth2.TokenInfo) error {
 
 // RemoveByCode deletes the authorization code
 func (s *TokenStore) RemoveByCode(code string) error {
-	err := s.adapter.Exec(fmt.Sprintf("DELETE FROM %s WHERE code = $1", s.tableName), code)
+	err := s.adapter.Exec(context.Background(), fmt.Sprintf("DELETE FROM %s WHERE code = $1", s.tableName), code)
 	if err == pgadapter.ErrNoRows {
 		return nil
 	}
@@ -155,7 +158,7 @@ func (s *TokenStore) RemoveByCode(code string) error {
 
 // RemoveByAccess uses the access token to delete the token information
 func (s *TokenStore) RemoveByAccess(access string) error {
-	err := s.adapter.Exec(fmt.Sprintf("DELETE FROM %s WHERE access = $1", s.tableName), access)
+	err := s.adapter.Exec(context.Background(), fmt.Sprintf("DELETE FROM %s WHERE access = $1", s.tableName), access)
 	if err == pgadapter.ErrNoRows {
 		return nil
 	}
@@ -164,7 +167,7 @@ func (s *TokenStore) RemoveByAccess(access string) error {
 
 // RemoveByRefresh uses the refresh token to delete the token information
 func (s *TokenStore) RemoveByRefresh(refresh string) error {
-	err := s.adapter.Exec(fmt.Sprintf("DELETE FROM %s WHERE refresh = $1", s.tableName), refresh)
+	err := s.adapter.Exec(context.Background(), fmt.Sprintf("DELETE FROM %s WHERE refresh = $1", s.tableName), refresh)
 	if err == pgadapter.ErrNoRows {
 		return nil
 	}
@@ -184,7 +187,7 @@ func (s *TokenStore) GetByCode(code string) (oauth2.TokenInfo, error) {
 	}
 
 	var item TokenStoreItem
-	if err := s.adapter.SelectOne(&item, fmt.Sprintf("SELECT * FROM %s WHERE code = $1", s.tableName), code); err != nil {
+	if err := s.adapter.SelectOne(context.Background(), &item, fmt.Sprintf("SELECT * FROM %s WHERE code = $1", s.tableName), code); err != nil {
 		return nil, err
 	}
 
@@ -198,7 +201,7 @@ func (s *TokenStore) GetByAccess(access string) (oauth2.TokenInfo, error) {
 	}
 
 	var item TokenStoreItem
-	if err := s.adapter.SelectOne(&item, fmt.Sprintf("SELECT * FROM %s WHERE access = $1", s.tableName), access); err != nil {
+	if err := s.adapter.SelectOne(context.Background(), &item, fmt.Sprintf("SELECT * FROM %s WHERE access = $1", s.tableName), access); err != nil {
 		return nil, err
 	}
 
@@ -212,7 +215,7 @@ func (s *TokenStore) GetByRefresh(refresh string) (oauth2.TokenInfo, error) {
 	}
 
 	var item TokenStoreItem
-	if err := s.adapter.SelectOne(&item, fmt.Sprintf("SELECT * FROM %s WHERE refresh = $1", s.tableName), refresh); err != nil {
+	if err := s.adapter.SelectOne(context.Background(), &item, fmt.Sprintf("SELECT * FROM %s WHERE refresh = $1", s.tableName), refresh); err != nil {
 		return nil, err
 	}