v1.9.21

yulei1 · yulei1 · commit 4eb4551afb52 · 2020-11-16T15:03:33.000+08:00
diff --git a/association_test.go b/association_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func TestBelongsTo(t *testing.T) {
diff --git a/callbacks_test.go b/callbacks_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func (s *Product) BeforeCreate() (err error) {
diff --git a/customize_column_test.go b/customize_column_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 type CustomizeColumn struct {
diff --git a/dialects/mssql/mssql.go b/dialects/mssql/mssql.go
@@ -12,7 +12,7 @@ import (
 
 	// Importing mssql driver package only in dialect file, otherwide not needed
 	_ "github.com/denisenkom/go-mssqldb"
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func setIdentityInsert(scope *gorm.Scope) {
diff --git a/errors_test.go b/errors_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func TestErrorsCanBeUsedOutsideGorm(t *testing.T) {
diff --git a/field_test.go b/field_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 type CalculateField struct {
diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.12
 require (
 	github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5
-	//github.com/go-sql-driver/mysql v1.4.1
 	github.com/goees/go-mysql v1.5.1
 	github.com/jinzhu/inflection v1.0.0
 	github.com/jinzhu/now v1.0.1
diff --git a/go.sum b/go.sum
@@ -21,8 +21,6 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goees/go-mysql v1.5.1 h1:Q/uCxSET2fFMkhy8xUxIqIBJGflYM3GTG2BRoXUrimI=
 github.com/goees/go-mysql v1.5.1/go.mod h1:SG558muorU1pCBK6c1tu0YCuIzJVsXqoVcKidiYVni8=
diff --git a/join_table_test.go b/join_table_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 type Person struct {
diff --git a/main_test.go b/main_test.go
@@ -19,11 +19,11 @@ import (
 	"time"
 
 	"github.com/erikstmartin/go-testdb"
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mssql"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
-	"github.com/jinzhu/gorm/dialects/postgres"
-	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	"github.com/goees/jinzhu-gorm"
+	_ "github.com/goees/jinzhu-gorm/dialects/mssql"
+	_ "github.com/goees/jinzhu-gorm/dialects/mysql"
+	"github.com/goees/jinzhu-gorm/dialects/postgres"
+	_ "github.com/goees/jinzhu-gorm/dialects/sqlite"
 	"github.com/jinzhu/now"
 )
 
diff --git a/migration_test.go b/migration_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 type User struct {
diff --git a/naming_test.go b/naming_test.go
@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func TestTheNamingStrategy(t *testing.T) {
diff --git a/preload_test.go b/preload_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func getPreloadUser(name string) *User {
diff --git a/query_test.go b/query_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 
 	"testing"
 	"time"
diff --git a/scaner_test.go b/scaner_test.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func TestScannableSlices(t *testing.T) {
diff --git a/scope_test.go b/scope_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func NameIn1And2(d *gorm.DB) *gorm.DB {
diff --git a/update_test.go b/update_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/goees/jinzhu-gorm"
 )
 
 func TestUpdate(t *testing.T) {
diff --git a/utils.go b/utils.go
@@ -25,8 +25,8 @@ var NowFunc = func() time.Time {
 var commonInitialisms = []string{"API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "LHS", "QPS", "RAM", "RHS", "RPC", "SLA", "SMTP", "SSH", "TLS", "TTL", "UID", "UI", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XSRF", "XSS"}
 var commonInitialismsReplacer *strings.Replacer
 
-var goSrcRegexp = regexp.MustCompile(`jinzhu/gorm(@.*)?/.*.go`)
-var goTestRegexp = regexp.MustCompile(`jinzhu/gorm(@.*)?/.*test.go`)
+var goSrcRegexp = regexp.MustCompile(`goees/jinzhu-gorm(@.*)?/.*.go`)
+var goTestRegexp = regexp.MustCompile(`goees/jinzhu-gorm(@.*)?/.*test.go`)
 
 func init() {
 	var commonInitialismsForReplacer []string

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"sort"`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/jinzhu/gorm"`
	`10`	`+ "github.com/goees/jinzhu-gorm"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestBelongsTo(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"reflect"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/jinzhu/gorm"`
	`8`	`+ "github.com/goees/jinzhu-gorm"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func (s *Product) BeforeCreate() (err error) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/jinzhu/gorm"`
	`7`	`+ "github.com/goees/jinzhu-gorm"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type CustomizeColumn struct {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`// Importing mssql driver package only in dialect file, otherwide not needed`
`14`	`14`	`_ "github.com/denisenkom/go-mssqldb"`
`15`		`- "github.com/jinzhu/gorm"`
	`15`	`+ "github.com/goees/jinzhu-gorm"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func setIdentityInsert(scope *gorm.Scope) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/jinzhu/gorm"`
	`7`	`+ "github.com/goees/jinzhu-gorm"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestErrorsCanBeUsedOutsideGorm(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- "github.com/jinzhu/gorm"`
	`9`	`+ "github.com/goees/jinzhu-gorm"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type CalculateField struct {`