db: gorp moved to github.com/go-gorp/gorp

db/client.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/coopernurse/gorp"
 	"github.com/coreos/go-oidc/oidc"
+	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 	"golang.org/x/crypto/bcrypt"
 

db/conn.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	_ "github.com/lib/pq"
 
 	"github.com/coreos/dex/pkg/log"

db/connector_config.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 
 	"github.com/coreos/dex/connector"

db/gc.go

@@ -3,7 +3,7 @@ package db
 import (
 	"time"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/jonboulle/clockwork"
 
 	"github.com/coreos/dex/pkg/log"

db/health.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 )
 
 func NewHealthChecker(dbm *gorp.DbMap) *healthChecker {

db/key.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 
 	pcrypto "github.com/coreos/dex/pkg/crypto"

db/migrate.go

@@ -3,7 +3,7 @@ package db
 import (
 	"fmt"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 	migrate "github.com/rubenv/sql-migrate"
 

db/migrate_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 )
 
 func initDB(dsn string) *gorp.DbMap {

db/password.go

@@ -4,10 +4,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/coopernurse/gorp"
-
 	"github.com/coreos/dex/repo"
 	"github.com/coreos/dex/user"
+	"github.com/go-gorp/gorp"
 )
 
 const (

db/refresh.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coopernurse/gorp"
 	"github.com/coreos/dex/refresh"
+	"github.com/go-gorp/gorp"
 	"golang.org/x/crypto/bcrypt"
 )
 

db/session.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/jonboulle/clockwork"
 	"github.com/lib/pq"
 

db/session_key.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/jonboulle/clockwork"
 	"github.com/lib/pq"
 

db/user.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coopernurse/gorp"
+	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 
 	"github.com/coreos/dex/repo"

functional/db_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coopernurse/gorp"
 	"github.com/coreos/go-oidc/key"
 	"github.com/coreos/go-oidc/oidc"
+	"github.com/go-gorp/gorp"
 	"github.com/kylelemons/godebug/pretty"
 
 	"github.com/coreos/dex/client"

functional/repo/testutil.go

@@ -3,9 +3,8 @@ package repo
 import (
 	"fmt"
 
-	"github.com/coopernurse/gorp"
-
 	"github.com/coreos/dex/db"
+	"github.com/go-gorp/gorp"
 )
 
 func initDB(dsn string) *gorp.DbMap {