Skip to content

Commit

Permalink
*: switch from lib/pq to jackc/{pgconn,pgx}
Browse files Browse the repository at this point in the history
Closes ory#1599
  • Loading branch information
glerchundi committed Feb 20, 2020
1 parent 74d8e31 commit 57b099d
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 70 deletions.
2 changes: 1 addition & 1 deletion client/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"testing"

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

. "github.com/ory/hydra/client"
Expand Down
2 changes: 1 addition & 1 deletion consent/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"time"

_ "github.com/go-sql-driver/mysql"
_ "github.com/jackc/pgx/v4/stdlib"
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
"github.com/stretchr/testify/require"

"github.com/ory/viper"
Expand Down
15 changes: 11 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/ory/hydra

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

replace github.com/ory/x => github.com/glerchundi/x v0.0.97-0.20200220172331-a9490d463139

go 1.13

0 comments on commit 57b099d

Please sign in to comment.