vendor: Fix SQL-regression caused by go 1.12.7 (ory#1534)

Makefile

@@ -16,7 +16,7 @@ test:
 		TEST_DATABASE_MYSQL='mysql://root:secret@(127.0.0.1:3444)/mysql?parseTime=true' \
 		TEST_DATABASE_POSTGRESQL='postgres://postgres:[email protected]:3445/hydra?sslmode=disable' \
 		TEST_DATABASE_COCKROACHDB='cockroach://[email protected]:3446/defaultdb?sslmode=disable' \
-		go-acc ./... -- -failfast -timeout=20m
+		$$(go env GOPATH)/bin/go-acc ./... -- -failfast -timeout=20m
 		docker rm -f hydra_test_database_mysql
 		docker rm -f hydra_test_database_postgres
 		docker rm -f hydra_test_database_cockroach

client/sdk_test.go

@@ -34,7 +34,7 @@ import (
 	"github.com/ory/x/pointerx"
 	"github.com/ory/x/urlx"
 
-	"github.com/spf13/viper"
+	"github.com/ory/viper"
 
 	"github.com/ory/hydra/driver/configuration"
 

client/validator_test.go

@@ -26,11 +26,12 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	jose "gopkg.in/square/go-jose.v2"
 
+	"github.com/ory/viper"
+
 	. "github.com/ory/hydra/client"
 	"github.com/ory/hydra/driver/configuration"
 	"github.com/ory/hydra/internal"

cmd/cli/handler_migrate.go

@@ -28,7 +28,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+
+	"github.com/ory/viper"
 
 	"github.com/ory/hydra/driver"
 	"github.com/ory/hydra/driver/configuration"

cmd/root.go

@@ -28,7 +28,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+
+	"github.com/ory/viper"
 
 	"github.com/ory/hydra/cmd/cli"
 )

cmd/server/helper_cert.go

@@ -26,7 +26,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 
-	"github.com/spf13/viper"
+	"github.com/ory/viper"
 
 	"github.com/ory/hydra/driver"
 

consent/manager_test.go

@@ -29,9 +29,10 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ory/viper"
+
 	. "github.com/ory/hydra/consent"
 	"github.com/ory/hydra/driver"
 	"github.com/ory/hydra/driver/configuration"

consent/sdk_test.go

@@ -35,7 +35,7 @@ import (
 
 	"github.com/ory/hydra/x"
 
-	"github.com/spf13/viper"
+	"github.com/ory/viper"
 
 	"github.com/ory/hydra/driver/configuration"
 	"github.com/ory/hydra/internal"