Merge 8909aa382b01ca48e8e115a75ed00f6f771ec6c7 into 38f96c65140f00f0b15efc495a487cfd5db510b8

association_test.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func TestBelongsTo(t *testing.T) {

callbacks_test.go

@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"errors"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 
 	"reflect"
 	"testing"

customize_column_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 type CustomizeColumn struct {

dialect_pgx.go

@@ -0,0 +1,13 @@
+package gorm
+
+type pgx struct {
+	postgres
+}
+
+func init() {
+	RegisterDialect("pgx", &pgx{})
+}
+
+func (pgx) GetName() string {
+	return "pgx"
+}

dialects/pgx/pgx.go

@@ -0,0 +1,3 @@
+package pgx
+
+import _ "github.com/jackc/pgx/stdlib"

errors_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func TestErrorsCanBeUsedOutsideGorm(t *testing.T) {

field_test.go

@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 type CalculateField struct {

join_table_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 type Person struct {

main_test.go

@@ -12,11 +12,12 @@ import (
 	"time"
 
 	"github.com/erikstmartin/go-testdb"
-	"github.com/jinzhu/gorm"
+	"gorm"
-	_ "github.com/jinzhu/gorm/dialects/mssql"
+	_ "gorm/dialects/mssql"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
+	_ "gorm/dialects/mysql"
-	"github.com/jinzhu/gorm/dialects/postgres"
+	"gorm/dialects/postgres"
-	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	_ "gorm/dialects/sqlite"
+	_ "gorm/dialects/pgx"
 	"github.com/jinzhu/now"
 )
 
@@ -54,6 +55,13 @@ func OpenTestConnection() (db *gorm.DB, err error) {
 			dbhost = fmt.Sprintf("host=%v ", dbhost)
 		}
 		db, err = gorm.Open("postgres", fmt.Sprintf("%vuser=gorm password=gorm DB.name=gorm sslmode=disable", dbhost))
+	case "pgx":
+		fmt.Println("testing pgx...")
+		dbhost := os.Getenv("GORM_DBHOST")
+		if dbhost != "" {
+			dbhost = fmt.Sprintf("host=%v ", dbhost)
+		}
+		db, err = gorm.Open("pgx", fmt.Sprintf("%vuser=gorm password=gorm database=gorm sslmode=disable", dbhost))
 	case "foundation":
 		fmt.Println("testing foundation...")
 		db, err = gorm.Open("foundation", "dbname=gorm port=15432 sslmode=disable")

migration_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 type User struct {

preload_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func getPreloadUser(name string) *User {

query_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 
 	"testing"
 	"time"

scaner_test.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func TestScannableSlices(t *testing.T) {

scope_test.go

@@ -1,7 +1,7 @@
 package gorm_test
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm"
 	"testing"
 )
 

update_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func TestUpdate(t *testing.T) {

utils_test.go

@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"gorm"
 )
 
 func TestToDBNameGenerateFriendlyName(t *testing.T) {