Skip to content

Commit fc149e3

Browse files
vgarvardtvgarvardt
committed
Migrated tests to pgx v4
1 parent 6fff47f commit fc149e3

File tree

3 files changed

+32
-17
lines changed

3 files changed

+32
-17
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/vgarvardt/go-oauth2-pg
33
go 1.12
44

55
require (
6-
github.com/jackc/pgx v3.6.2+incompatible
6+
github.com/jackc/pgx/v4 v4.4.1
77
github.com/jmoiron/sqlx v1.2.0
88
github.com/json-iterator/go v1.1.7
99
github.com/stretchr/testify v1.4.0
10-
github.com/vgarvardt/go-pg-adapter v0.4.0
10+
github.com/vgarvardt/go-pg-adapter v0.4.1
1111
gopkg.in/oauth2.v3 v3.10.1
1212
)

‎go.sum‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,36 @@ github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM
3434
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
3535
github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
3636
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
37+
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
3738
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
3839
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
40+
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
3941
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
4042
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
4143
github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
4244
github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
4345
github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
4446
github.com/jackc/pgconn v1.3.0/go.mod h1:2Ze5IP7prCiM28C4nc5LUoRaSyMDYZFE32L4gMJVtcU=
47+
github.com/jackc/pgconn v1.3.2 h1:9UIGICxEAW70RQDGilGwsCG63NCcm5amjuBQCFzrmsw=
4548
github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
49+
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
4650
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
4751
github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
52+
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
4853
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
54+
github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
4955
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
5056
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
5157
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
5258
github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
5359
github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
60+
github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M=
5461
github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
5562
github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
5663
github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
5764
github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
5865
github.com/jackc/pgtype v1.1.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
66+
github.com/jackc/pgtype v1.2.0 h1:JuOJqN8dtahBO+jqvtAdMiY32NI5obiZRWa+C17Vd4s=
5967
github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
6068
github.com/jackc/pgx v3.5.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
6169
github.com/jackc/pgx v3.6.0+incompatible h1:bJeo4JdVbDAW8KB2m8XkFeo8CPipREoG37BwEoKGz+Q=
@@ -66,10 +74,12 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08
6674
github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
6775
github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
6876
github.com/jackc/pgx/v4 v4.3.0/go.mod h1:BiIGdCptiC/hXZI8EkeixUG0xzTPn9J6S2YSXEBFidE=
77+
github.com/jackc/pgx/v4 v4.4.1 h1:OBZhZFlzBMC9yUD6wAFzlFFuxfZTV+YvloSPO1k+puA=
6978
github.com/jackc/pgx/v4 v4.4.1/go.mod h1:6iSW+JznC0YT+SgBn7rNxoEBsBgSmnC5FwyCekOGUiE=
7079
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
7180
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
7281
github.com/jackc/puddle v1.0.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
82+
github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU=
7383
github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
7484
github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
7585
github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
@@ -153,8 +163,11 @@ github.com/vgarvardt/go-pg-adapter v0.3.0 h1:YQkTVNU7eQU1mM55H8N4/XSqZP6dOR3A6uC
153163
github.com/vgarvardt/go-pg-adapter v0.3.0/go.mod h1:+ogRTaGusDQb1lhZGoUxKQAGIbL+Lv43ePl/NUQArPI=
154164
github.com/vgarvardt/go-pg-adapter v0.4.0 h1:YQjap5guYnu78kDumnLBYfLLMsUMQi2l5iX41bkBZHQ=
155165
github.com/vgarvardt/go-pg-adapter v0.4.0/go.mod h1:7O3IHiNpF4GdO0IFIdo5VaslOKLse3mqI9M3eQlGcQk=
166+
github.com/vgarvardt/go-pg-adapter v0.4.1 h1:uNv+8mJkpBRRV3SHcvykDruyKdoOpvNo3KfOnkm3UaQ=
167+
github.com/vgarvardt/go-pg-adapter v0.4.1/go.mod h1:7O3IHiNpF4GdO0IFIdo5VaslOKLse3mqI9M3eQlGcQk=
156168
github.com/vgarvardt/pgx-helpers v0.0.0-20190703163610-cbb413594454 h1:EuawyZK2iXOuR3dfvE6jwmIM6V5ML0Q8Ohw7rKycowg=
157169
github.com/vgarvardt/pgx-helpers v0.0.0-20190703163610-cbb413594454/go.mod h1:xp2aDvL8NKu92fXxNr9kbH03+OJ+dIVu/dYfPxt3LWs=
170+
github.com/vgarvardt/pgx-helpers/v4 v4.0.0-20200225100150-876aee3d1a22 h1:4FALl8RvmCRmHOy1z0fDRCdf8NQBg5rP9sGPxP1haoQ=
158171
github.com/vgarvardt/pgx-helpers/v4 v4.0.0-20200225100150-876aee3d1a22/go.mod h1:vFsMp4/TQkKX4HeOynXa6npSFBWUusa3S+fFW7IejqE=
159172
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
160173
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
@@ -210,6 +223,7 @@ golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtn
210223
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
211224
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
212225
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
226+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
213227
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
214228
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
215229
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=

‎token_store_test.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/jackc/pgx"
13-
_ "github.com/jackc/pgx/stdlib"
12+
"github.com/jackc/pgx/v4"
13+
"github.com/jackc/pgx/v4/pgxpool"
14+
_ "github.com/jackc/pgx/v4/stdlib"
1415
"github.com/jmoiron/sqlx"
1516
"github.com/stretchr/testify/assert"
1617
"github.com/stretchr/testify/mock"
1718
"github.com/stretchr/testify/require"
1819
"gopkg.in/oauth2.v3/models"
1920

2021
"github.com/vgarvardt/go-pg-adapter"
21-
"github.com/vgarvardt/go-pg-adapter/pgx3adapter"
22+
"github.com/vgarvardt/go-pg-adapter/pgx4adapter"
2223
"github.com/vgarvardt/go-pg-adapter/sqladapter"
2324
)
2425

@@ -39,6 +40,7 @@ type memoryLogger struct {
3940
args [][]interface{}
4041

4142
pgxLogs []struct {
43+
ctx context.Context
4244
level pgx.LogLevel
4345
msg string
4446
data map[string]interface{}
@@ -50,12 +52,13 @@ func (l *memoryLogger) Printf(format string, v ...interface{}) {
5052
l.args = append(l.args, v)
5153
}
5254

53-
func (l *memoryLogger) Log(level pgx.LogLevel, msg string, data map[string]interface{}) {
55+
func (l *memoryLogger) Log(ctx context.Context, level pgx.LogLevel, msg string, data map[string]interface{}) {
5456
l.pgxLogs = append(l.pgxLogs, struct {
57+
ctx context.Context
5558
level pgx.LogLevel
5659
msg string
5760
data map[string]interface{}
58-
}{level: level, msg: msg, data: data})
61+
}{ctx: ctx, level: level, msg: msg, data: data})
5962
}
6063

6164
type mockAdapter struct {
@@ -122,19 +125,19 @@ func generateClientTableName() string {
122125
func TestPGXConn(t *testing.T) {
123126
l := new(memoryLogger)
124127

125-
pgxConnConfig, err := pgx.ParseURI(uri)
128+
pgxConnConfig, err := pgx.ParseConfig(uri)
126129
require.NoError(t, err)
127130

128131
pgxConnConfig.Logger = l
129132

130-
pgxConn, err := pgx.Connect(pgxConnConfig)
133+
pgxConn, err := pgx.ConnectConfig(context.Background(), pgxConnConfig)
131134
require.NoError(t, err)
132135

133136
defer func() {
134-
assert.NoError(t, pgxConn.Close())
137+
assert.NoError(t, pgxConn.Close(context.Background()))
135138
}()
136139

137-
adapter := pgx3adapter.NewConn(pgxConn)
140+
adapter := pgx4adapter.NewConn(pgxConn)
138141

139142
tokenStore, err := NewTokenStore(
140143
adapter,
@@ -161,19 +164,17 @@ func TestPGXConn(t *testing.T) {
161164
func TestPGXConnPool(t *testing.T) {
162165
l := new(memoryLogger)
163166

164-
pgxConnConfig, err := pgx.ParseURI(uri)
167+
pgxPoolConnConfig, err := pgxpool.ParseConfig(uri)
165168
require.NoError(t, err)
166169

167-
pgxConnConfig.Logger = l
168-
169-
pgxPoolConfig := pgx.ConnPoolConfig{ConnConfig: pgxConnConfig}
170+
pgxPoolConnConfig.ConnConfig.Logger = l
170171

171-
pgXConnPool, err := pgx.NewConnPool(pgxPoolConfig)
172+
pgXConnPool, err := pgxpool.ConnectConfig(context.Background(), pgxPoolConnConfig)
172173
require.NoError(t, err)
173174

174175
defer pgXConnPool.Close()
175176

176-
adapter := pgx3adapter.NewConnPool(pgXConnPool)
177+
adapter := pgx4adapter.NewPool(pgXConnPool)
177178

178179
tokenStore, err := NewTokenStore(
179180
adapter,

0 commit comments

Comments
 (0)