Move convert into internal

2021-07-21 10:36:49 +08:00 · 2021-07-21 10:36:49 +08:00 · 54f54acfc3
parent 9f45727bdd
commit 54f54acfc3
19 changed files with 10 additions and 10 deletions
--- a/2
+++ b/2
@ -6,7 +6,7 @@ GOFMT ?= gofmt -s
 TAGS ?=
 SED_INPLACE := sed -i

-GO_DIRS := caches contexts integrations convert core dialects internal log migrate names schemas tags
+GO_DIRS := caches contexts integrations core dialects internal log migrate names schemas tags
 GOFILES := $(wildcard *.go)
 GOFILES += $(shell find $(GO_DIRS) -name "*.go" -type f)
 INTEGRATION_PACKAGES := xorm.io/xorm/integrations
--- a/convert.go
+++ b/convert.go
@ -15,7 +15,7 @@ import (
 	"strconv"
 	"time"

-	"xorm.io/xorm/convert"
+	"xorm.io/xorm/internal/convert"
 )

 var errNilPtr = errors.New("destination pointer is nil") // embedded in descriptive error
--- a/integrations/types_test.go
+++ b/integrations/types_test.go
@ -13,7 +13,7 @@ import (
 	"testing"

 	"xorm.io/xorm"
-	"xorm.io/xorm/convert"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/json"
 	"xorm.io/xorm/schemas"

--- a/internal/convert/bool.go
+++ b/internal/convert/bool.go
--- a/internal/convert/conversion.go
+++ b/internal/convert/conversion.go
--- a/internal/convert/float.go
+++ b/internal/convert/float.go
--- a/internal/convert/int.go
+++ b/internal/convert/int.go
--- a/internal/convert/interface.go
+++ b/internal/convert/interface.go
--- a/internal/convert/scanner.go
+++ b/internal/convert/scanner.go
--- a/internal/convert/string.go
+++ b/internal/convert/string.go
--- a/internal/convert/time.go
+++ b/internal/convert/time.go
--- a/internal/convert/time_test.go
+++ b/internal/convert/time_test.go
--- a/internal/statements/statement.go
+++ b/internal/statements/statement.go
@ -15,8 +15,8 @@ import (

 	"xorm.io/builder"
 	"xorm.io/xorm/contexts"
-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/json"
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
--- a/internal/statements/update.go
+++ b/internal/statements/update.go
@ -11,8 +11,8 @@ import (
 	"reflect"
 	"time"

-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/json"
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
--- a/internal/statements/values.go
+++ b/internal/statements/values.go
@ -12,8 +12,8 @@ import (
 	"reflect"
 	"time"

-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/json"
 	"xorm.io/xorm/schemas"
 )
--- a/scan.go
+++ b/scan.go
@ -11,9 +11,9 @@ import (
 	"reflect"
 	"time"

-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
 	"xorm.io/xorm/dialects"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/schemas"
 )

--- a/session.go
+++ b/session.go
@ -18,8 +18,8 @@ import (
 	"strings"

 	"xorm.io/xorm/contexts"
-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/json"
 	"xorm.io/xorm/internal/statements"
 	"xorm.io/xorm/log"
--- a/session_get.go
+++ b/session_get.go
@ -15,8 +15,8 @@ import (
 	"time"

 	"xorm.io/xorm/caches"
-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
 )
--- a/tags/parser.go
+++ b/tags/parser.go
@ -14,8 +14,8 @@ import (
 	"unicode"

 	"xorm.io/xorm/caches"
-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/dialects"
+	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/names"
 	"xorm.io/xorm/schemas"
 )