Merge pull request #6 from vgarvardt/patch/use-adapter-package

Use adapter package instead of bundling adapters

Author: vgarvardt

Gopkg.lock

@@ -45,10 +45,10 @@
   name = "github.com/jmoiron/sqlx"
   version = "1.2.0"
 
-[[constraint]]
-  name = "github.com/vgarvardt/pgx-helpers"
-  version = "0.1.0"
-
 [[constraint]]
   name = "github.com/stretchr/testify"
   version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/vgarvardt/go-pg-adapter"
+  version = "0.1.1"

Gopkg.toml

@@ -10,12 +10,7 @@ $ go get -u -v github.com/vgarvardt/go-oauth2-pg
 
 ## PostgreSQL drivers
 
-The store accepts an adapter interface that interacts with the DB. The package is bundled with the following adapter implementations
-
-- `database/sql` (e.g. [`github.com/lib/pq`](https://github.com/lib/pq)) - `github.com/vgarvardt/go-oauth2-pg/sql_adapter.New()`
-- [`github.com/jmoiron/sqlx.DB`](https://github.com/jmoiron/sqlx) - `github.com/vgarvardt/go-oauth2-pg/sql_adapter.NewX()`
-- [`github.com/jackc/pgx.Conn`](https://github.com/jackc/pgx) - `github.com/vgarvardt/go-oauth2-pg/pgx_adapter.NewConn()`
-- [`github.com/jackc/pgx.ConnPool`](https://github.com/jackc/pgx) - `github.com/vgarvardt/go-oauth2-pg/pgx_adapter.NewConnPool()`
+The store accepts an adapter interface that interacts with the DB. Adapter and implementations are extracted to separate package [`github.com/vgarvardt/go-pg-adapter`](https://github.com/vgarvardt/go-pg-adapter) for easier maintenance.
 
 ## Usage example
 
@@ -28,7 +23,7 @@ import (
 
 	"github.com/jackc/pgx"
 	pg "github.com/vgarvardt/go-oauth2-pg"
-	pgxAdapter "github.com/vgarvardt/go-oauth2-pg/pgx_adapter"
+	"github.com/vgarvardt/go-pg-adapter/pgxadapter"
 	"gopkg.in/oauth2.v3/manage"
 )
 
@@ -39,7 +34,7 @@ func main() {
 	manager := manage.NewDefaultManager()
 
 	// use PostgreSQL token store with pgx.Connection adapter
-	adapter := pgxAdapter.NewConn(pgxConn)
+	adapter := pgxadapter.NewConn(pgxConn)
 	tokenStore, _ := pg.NewTokenStore(adapter, pg.WithTokenStoreGCInterval(time.Minute))
 	defer tokenStore.Close()
 

README.md

@@ -6,13 +6,14 @@ import (
 	"os"
 
 	"github.com/json-iterator/go"
+	"github.com/vgarvardt/go-pg-adapter"
 	"gopkg.in/oauth2.v3"
 	"gopkg.in/oauth2.v3/models"
 )
 
 // ClientStore PostgreSQL client store
 type ClientStore struct {
-	adapter   Adapter
+	adapter   pgadapter.Adapter
 	tableName string
 	logger    Logger
 
@@ -28,7 +29,7 @@ type ClientStoreItem struct {
 }
 
 // NewClientStore creates PostgreSQL store instance
-func NewClientStore(adapter Adapter, options ...ClientStoreOption) (*ClientStore, error) {
+func NewClientStore(adapter pgadapter.Adapter, options ...ClientStoreOption) (*ClientStore, error) {
 	store := &ClientStore{
 		adapter:   adapter,
 		tableName: "oauth2_clients",

client_store.go

@@ -1,16 +1,5 @@
 package pg
 
-import "errors"
-
-// ErrNoRows is the driver-agnostic error returned when no record is found
-var ErrNoRows = errors.New("sql: no rows in result set")
-
-// Adapter represents DB access layer interface for different PostgreSQL drivers
-type Adapter interface {
-	Exec(query string, args ...interface{}) error
-	SelectOne(dst interface{}, query string, args ...interface{}) error
-}
-
 // Logger is the PostgreSQL store logger interface
 type Logger interface {
 	Printf(format string, v ...interface{})