From 74df09acb643c7bca459e3b8b201c40da58ec86b Mon Sep 17 00:00:00 2001
From: Bobby Rullo <bobby.rullo@coreos.com>
Date: Mon, 24 Aug 2015 15:35:44 -0700
Subject: [PATCH] db: gorp moved to github.com/go-gorp/gorp

---
 db/client.go                | 2 +-
 db/conn.go                  | 2 +-
 db/connector_config.go      | 2 +-
 db/gc.go                    | 2 +-
 db/health.go                | 2 +-
 db/key.go                   | 2 +-
 db/migrate.go               | 2 +-
 db/migrate_test.go          | 2 +-
 db/password.go              | 3 +--
 db/refresh.go               | 2 +-
 db/session.go               | 2 +-
 db/session_key.go           | 2 +-
 db/user.go                  | 2 +-
 functional/db_test.go       | 2 +-
 functional/repo/testutil.go | 3 +--
 15 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/db/client.go b/db/client.go
index 23cc6108..5eb9e69d 100644
--- a/db/client.go
+++ b/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"
 
diff --git a/db/conn.go b/db/conn.go
index 6baa5e32..6bff1349 100644
--- a/db/conn.go
+++ b/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"
diff --git a/db/connector_config.go b/db/connector_config.go
index 8686a33e..f9d8386e 100644
--- a/db/connector_config.go
+++ b/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"
diff --git a/db/gc.go b/db/gc.go
index fe5a5479..4bbdd6b6 100644
--- a/db/gc.go
+++ b/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"
diff --git a/db/health.go b/db/health.go
index 139ad17f..95cbd357 100644
--- a/db/health.go
+++ b/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 {
diff --git a/db/key.go b/db/key.go
index a5eec35f..1858f9c2 100644
--- a/db/key.go
+++ b/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"
diff --git a/db/migrate.go b/db/migrate.go
index bdb42366..504732f6 100644
--- a/db/migrate.go
+++ b/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"
 
diff --git a/db/migrate_test.go b/db/migrate_test.go
index 41c9b51f..41cbd74f 100644
--- a/db/migrate_test.go
+++ b/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 {
diff --git a/db/password.go b/db/password.go
index d575c152..eb96f59c 100644
--- a/db/password.go
+++ b/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 (
diff --git a/db/refresh.go b/db/refresh.go
index d65e275f..9e2ef23c 100644
--- a/db/refresh.go
+++ b/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"
 )
 
diff --git a/db/session.go b/db/session.go
index 4478e93b..c281b206 100644
--- a/db/session.go
+++ b/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"
 
diff --git a/db/session_key.go b/db/session_key.go
index e3e480fc..0ce189b6 100644
--- a/db/session_key.go
+++ b/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"
 
diff --git a/db/user.go b/db/user.go
index 50ee8593..d119e773 100644
--- a/db/user.go
+++ b/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"
diff --git a/functional/db_test.go b/functional/db_test.go
index dbb7df70..c308526f 100644
--- a/functional/db_test.go
+++ b/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"
diff --git a/functional/repo/testutil.go b/functional/repo/testutil.go
index fef24536..233c2aee 100644
--- a/functional/repo/testutil.go
+++ b/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 {