Skip to content

Commit 21b34d0

Browse files
committed
refactor: switch from lib/pq to jackc/{pgconn,pgx}
Closes ory#1599
1 parent 74d8e31 commit 21b34d0

File tree

6 files changed

+137
-136
lines changed

6 files changed

+137
-136
lines changed

client/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"testing"
2929

3030
_ "github.com/go-sql-driver/mysql"
31-
_ "github.com/lib/pq"
31+
_ "github.com/jackc/pgx/v4/stdlib"
3232
"github.com/stretchr/testify/require"
3333

3434
. "github.com/ory/hydra/client"

consent/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"time"
2828

2929
_ "github.com/go-sql-driver/mysql"
30+
_ "github.com/jackc/pgx/v4/stdlib"
3031
"github.com/jmoiron/sqlx"
31-
_ "github.com/lib/pq"
3232
"github.com/stretchr/testify/require"
3333

3434
"github.com/ory/viper"

go.mod

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/ory/hydra
22

33
require (
4+
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
5+
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
46
github.com/dgrijalva/jwt-go v3.2.0+incompatible
57
github.com/go-bindata/go-bindata v3.1.1+incompatible
68
github.com/go-openapi/errors v0.19.2
@@ -17,9 +19,9 @@ require (
1719
github.com/google/uuid v1.1.1
1820
github.com/gorilla/sessions v1.1.4-0.20181208214519-12bd4761fc66
1921
github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69
22+
github.com/jackc/pgx/v4 v4.4.1
2023
github.com/jmoiron/sqlx v1.2.0
2124
github.com/julienschmidt/httprouter v1.2.0
22-
github.com/lib/pq v1.2.0
2325
github.com/mattn/go-runewidth v0.0.4 // indirect
2426
github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103
2527
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
@@ -42,19 +44,22 @@ require (
4244
github.com/rs/cors v1.6.0
4345
github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7
4446
github.com/sawadashota/encrypta v0.0.2
47+
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
4548
github.com/sirupsen/logrus v1.4.2
4649
github.com/spf13/cast v1.3.1 // indirect
4750
github.com/spf13/cobra v0.0.5
4851
github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
4952
github.com/stretchr/testify v1.4.0
5053
github.com/toqueteos/webbrowser v1.2.0
51-
github.com/uber/jaeger-client-go v2.16.0+incompatible
52-
github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
54+
github.com/uber/jaeger-client-go v2.22.1+incompatible
5355
github.com/urfave/negroni v1.0.0
56+
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
57+
github.com/ziutek/mymysql v1.5.4 // indirect
5458
go.opentelemetry.io/otel v0.2.1
5559
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
5660
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
57-
golang.org/x/tools v0.0.0-20200203023011-6f24f261dadb
61+
golang.org/x/tools v0.0.0-20200203215610-ab391d50b528
62+
gopkg.in/gorp.v1 v1.7.2 // indirect
5863
gopkg.in/ini.v1 v1.51.1 // indirect
5964
gopkg.in/square/go-jose.v2 v2.3.1
6065
)
@@ -64,4 +69,6 @@ replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110
6469
// Fix for https://github.com/golang/lint/issues/436
6570
replace github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1
6671

72+
replace github.com/ory/x => github.com/glerchundi/x v0.0.97-0.20200220201834-6198cf911a89
73+
6774
go 1.13

0 commit comments

Comments
 (0)