move depends package from github.com to customize domain (#1327)

lunny · web-flow · commit c9b14f948700 · 2019-06-17T13:38:13.000+08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,8 +35,8 @@ jobs:
       - checkout
 
       - run: go get -t -d -v ./...
-      - run: go get -u github.com/go-xorm/core
-      - run: go get -u github.com/go-xorm/builder
+      - run: go get -u xorm.io/core
+      - run: go get -u xorm.io/builder
       - run: GO111MODULE=off go build -v
       - run: GO111MODULE=on go build -v
 
diff --git a/.drone.yml b/.drone.yml
@@ -59,8 +59,8 @@ pipeline:
     image: golang:${GO_VERSION}
     commands:
       - go get -t -d -v ./...
-      - go get -u github.com/go-xorm/core
-      - go get -u github.com/go-xorm/builder
+      - go get -u xorm.io/core
+      - go get -u xorm.io/builder
       - go build -v
     when:
       event: [ push, pull_request ]
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Xorm is a simple and powerful ORM for Go.
 
 * Optimistic Locking support
 
-* SQL Builder support via [github.com/go-xorm/builder](https://github.com/go-xorm/builder)
+* SQL Builder support via [xorm.io/builder](https://xorm.io/builder)
 
 * Automatical Read/Write seperatelly
 
diff --git a/cache_lru.go b/cache_lru.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // LRUCacher implments cache object facilities
diff --git a/cache_lru_test.go b/cache_lru_test.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cache_memory_store.go b/cache_memory_store.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"sync"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var _ core.CacheStore = NewMemoryStore()
diff --git a/dialect_mssql.go b/dialect_mssql.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_mssql_test.go b/dialect_mssql_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func TestParseMSSQL(t *testing.T) {
diff --git a/dialect_mysql.go b/dialect_mysql.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_oracle.go b/dialect_oracle.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_postgres.go b/dialect_postgres.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // from http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
diff --git a/dialect_postgres_test.go b/dialect_postgres_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/jackc/pgx/stdlib"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/dialect_sqlite3.go b/dialect_sqlite3.go
@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/engine.go b/engine.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 // Engine is the major struct of xorm, it means a database manager.
diff --git a/engine_cond.go b/engine_cond.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 func (engine *Engine) buildConds(table *core.Table, bean interface{},
diff --git a/engine_group.go b/engine_group.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // EngineGroup defines an engine group
diff --git a/engine_table.go b/engine_table.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // tbNameWithSchema will automatically add schema prefix on table name
diff --git a/go.mod b/go.mod
@@ -6,9 +6,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/go-xorm/builder v0.3.3
-	github.com/go-xorm/core v0.6.2
-	github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a // indirect
 	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
 	github.com/jackc/pgx v3.3.0+incompatible
@@ -22,4 +19,6 @@ require (
 	github.com/ziutek/mymysql v1.5.4
 	golang.org/x/crypto v0.0.0-20190122013713-64072686203f // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	xorm.io/builder v0.3.5
+	xorm.io/core v0.6.3
 )
diff --git a/go.sum b/go.sum
@@ -10,10 +10,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 h1:b5OnbZD49
 github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
 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-xorm/builder v0.3.3 h1:v8grgrwOGv/iHXIEhIvOwHZIPLrpxRKSX8yWSMLFn/4=
-github.com/go-xorm/builder v0.3.3/go.mod h1:v8mE3MFBgtL+RGFNfUnAMUqqfk/Y4W5KuwCFQIEpQLk=
-github.com/go-xorm/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
-github.com/go-xorm/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -53,3 +49,9 @@ google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO50
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A=
+xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8=
+xorm.io/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
+xorm.io/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
+xorm.io/core v0.6.3 h1:n1NhVZt1s2oLw1BZfX2ocIJsHyso259uPgg63BGr37M=
+xorm.io/core v0.6.3/go.mod h1:8kz/C6arVW/O9vk3PgCiMJO2hIAm1UcuOL3dSPyZ2qo=
diff --git a/helpers.go b/helpers.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // str2PK convert string value to primary key value according to tp
diff --git a/interface.go b/interface.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Interface defines the interface which Engine, EngineGroup and Session will implementate.
diff --git a/logger.go b/logger.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // default log options
diff --git a/rows.go b/rows.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Rows rows wrapper a rows to
diff --git a/session.go b/session.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 type sessionType int
diff --git a/session_cols.go b/session_cols.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 type incrParam struct {
diff --git a/session_cols_test.go b/session_cols_test.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_cond.go b/session_cond.go
@@ -4,7 +4,7 @@
 
 package xorm
 
-import "github.com/go-xorm/builder"
+import "xorm.io/builder"
 
 // Sql provides raw sql input parameter. When you have a complex SQL statement
 // and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
diff --git a/session_cond_test.go b/session_cond_test.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_convert.go b/session_convert.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func (session *Session) str2Time(col *core.Column, data string) (outTime time.Time, outErr error) {
diff --git a/session_delete.go b/session_delete.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func (session *Session) cacheDelete(table *core.Table, tableName, sqlStr string, args ...interface{}) error {
diff --git a/session_delete_test.go b/session_delete_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_exist.go b/session_exist.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 // Exist returns true if the record exist otherwise return false
diff --git a/session_find.go b/session_find.go
@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 const (
diff --git a/session_find_test.go b/session_find_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_get.go b/session_get.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Get retrieve one record from database, bean's non-empty fields
diff --git a/session_get_test.go b/session_get_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_insert.go b/session_insert.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Insert insert one or more beans
diff --git a/session_pk_test.go b/session_pk_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_query.go b/session_query.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 func (session *Session) genQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {
diff --git a/session_query_test.go b/session_query_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/session_raw.go b/session_raw.go
diff --git a/session_schema.go b/session_schema.go
diff --git a/session_stats_test.go b/session_stats_test.go
diff --git a/session_tx_test.go b/session_tx_test.go
diff --git a/session_update.go b/session_update.go
diff --git a/session_update_test.go b/session_update_test.go
diff --git a/statement.go b/statement.go
diff --git a/statement_test.go b/statement_test.go
diff --git a/syslogger.go b/syslogger.go
diff --git a/tag.go b/tag.go
diff --git a/tag_extends_test.go b/tag_extends_test.go
diff --git a/tag_id_test.go b/tag_id_test.go
diff --git a/tag_test.go b/tag_test.go
diff --git a/types.go b/types.go
diff --git a/types_test.go b/types_test.go
diff --git a/xorm.go b/xorm.go
diff --git a/xorm_test.go b/xorm_test.go

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"sync"`
`11`	`11`	`"time"`
`12`	`12`
`13`		`- "github.com/go-xorm/core"`
	`13`	`+ "xorm.io/core"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// LRUCacher implments cache object facilities`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package xorm`
`7`	`7`	`import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/go-xorm/core"`
	`10`	`+ "xorm.io/core"`
`11`	`11`	`"github.com/stretchr/testify/assert"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"strconv"`
`12`	`12`	`"strings"`
`13`	`13`
`14`		`- "github.com/go-xorm/core"`
	`14`	`+ "xorm.io/core"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"reflect"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/go-xorm/core"`
	`11`	`+ "xorm.io/core"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestParseMSSQL(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"strings"`
`14`	`14`	`"time"`
`15`	`15`
`16`		`- "github.com/go-xorm/core"`
	`16`	`+ "xorm.io/core"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"reflect"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/go-xorm/core"`
	`7`	`+ "xorm.io/core"`
`8`	`8`	`"github.com/jackc/pgx/stdlib"`
`9`	`9`	`"github.com/stretchr/testify/assert"`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`"sync"`
`21`	`21`	`"time"`
`22`	`22`
`23`		`- "github.com/go-xorm/builder"`
`24`		`- "github.com/go-xorm/core"`
	`23`	`+ "xorm.io/builder"`
	`24`	`+ "xorm.io/core"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// Engine is the major struct of xorm, it means a database manager.`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"strings"`
`12`	`12`	`"time"`
`13`	`13`
`14`		`- "github.com/go-xorm/builder"`
`15`		`- "github.com/go-xorm/core"`
	`14`	`+ "xorm.io/builder"`
	`15`	`+ "xorm.io/core"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func (engine Engine) buildConds(table core.Table, bean interface{},`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"context"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/go-xorm/core"`
	`11`	`+ "xorm.io/core"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// EngineGroup defines an engine group`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"reflect"`
`10`	`10`	`"strings"`
`11`	`11`
`12`		`- "github.com/go-xorm/core"`
	`12`	`+ "xorm.io/core"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// tbNameWithSchema will automatically add schema prefix on table name`