Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 132 #155

Closed
wants to merge 8 commits into from
Closed

Fix 132 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d696e7
Update pop and fizz package version to latest for supporing cockroach…
Dec 13, 2019
34302dd
Cockroach test suit enable
Dec 13, 2019
899f002
Patch pop & fizz latest version
Dec 13, 2019
ae9f53b
Patch pop & fizz latest version
Dec 13, 2019
82d3d91
Patch pop & fizz latest version
Dec 13, 2019
ed777df
Enable ssl mode for cockroach db
Dec 15, 2019
1277eae
Revert sslmode changes in cockroach db
Dec 15, 2019
5230dc2
Change cockroachdb URI
Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- TEST_SELFSERVICE_OIDC_HYDRA_INTEGRATION_ADDR=127.0.0.1:4499
- TEST_DATABASE_POSTGRESQL=postgres://test:test@localhost:5432/postgres?sslmode=disable
- TEST_DATABASE_MYSQL=mysql://root:test@(localhost:3306)/mysql?parseTime=true&multiStatements=true
- TEST_DATABASE_COCKROACHDB=cockroach://root@localhost:26257/defaultdb?sslmode=disable
- TEST_DATABASE_COCKROACHDB=postgres://root@localhost:26257/defaultdb?sslmode=disable
-
image: mailhog/mailhog:v1.0.0
command: MailHog -invite-jim -jim-linkspeed-affect=0.25 -jim-reject-auth=0.25 -jim-reject-recipient=0.25 -jim-reject-sender=0.25 -jim-disconnect=0.25 -jim-linkspeed-min=1250 -jim-linkspeed-max=12500
Expand Down
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ go 1.13

replace github.com/santhosh-tekuri/jsonschema/v2 => github.com/ory/jsonschema/v2 v2.1.1-0.20191123130340-1c20114d2c04

replace github.com/gobuffalo/pop/v4 => github.com/gobuffalo/pop/v5 v5.0.0

replace github.com/gobuffalo/fizz v1.9.5 => github.com/gobuffalo/fizz v1.9.6-0.20191207081922-e65fa5e5bed6

require (
github.com/Masterminds/sprig/v3 v3.0.0
github.com/bxcodec/faker v2.0.1+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ github.com/gobuffalo/events v1.1.9 h1:ukq5ys/h0TuiX7eLJyZBD1dJOy0r19JTEYmgXKG9j+
github.com/gobuffalo/events v1.1.9/go.mod h1:/0nf8lMtP5TkgNbzYxR6Bl4GzBy5s5TebgNTdRfRbPM=
github.com/gobuffalo/fizz v1.0.12 h1:JJOkmlStog5AiBL434UoGMJ896p3MnTnzedFVaZSF3k=
github.com/gobuffalo/fizz v1.0.12/go.mod h1:C0sltPxpYK8Ftvf64kbsQa2yiCZY4RZviurNxXdAKwc=
github.com/gobuffalo/fizz v1.9.5 h1:Qh0GkP7MYtJs9RZwBkPJ0CzEXynVowdNfrjg8b+TOxA=
github.com/gobuffalo/fizz v1.9.5/go.mod h1:v9cFl56oXm+hNNayTsIQHnq209bTDUbIM8GYWCJw3TE=
github.com/gobuffalo/fizz v1.9.6-0.20191207081922-e65fa5e5bed6 h1:a0svvTElCdZhoScHHYJAuQGtt+rQuRfX1DZwpokkTXw=
github.com/gobuffalo/fizz v1.9.6-0.20191207081922-e65fa5e5bed6/go.mod h1:M6I4X/qu5A79x4+5ryHRKb+RiLlEKafx3uZKdJeCrpM=
github.com/gobuffalo/flect v0.0.0-20180907193754-dc14d8acaf9f/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
github.com/gobuffalo/flect v0.0.0-20181002182613-4571df4b1daf/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
github.com/gobuffalo/flect v0.0.0-20181007231023-ae7ed6bfe683/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/persister_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestPersister(t *testing.T) {
funcs := map[string]func(t *testing.T) string{
"postgres": dockertest.RunTestPostgreSQL,
"mysql": dockertest.RunTestMySQL,
// "cockroach": dockertest.RunTestCockroachDB, // pending: https:/gobuffalo/fizz/pull/69
"cockroach": dockertest.RunTestCockroachDB, // pending: https:/gobuffalo/fizz/pull/69
}

var wg sync.WaitGroup
Expand Down