From cace6862e297b44505543f91efa73c92c2d636ed Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 10 Aug 2021 23:20:53 +0800 Subject: [PATCH] Move convert back to xorm.io/xorm/convert (#2030) Since `conversion.Conversion` has been referenced by external package, it should not be moved as internal package. Reviewed-on: https://gitea.com/xorm/xorm/pulls/2030 Co-authored-by: Lunny Xiao Co-committed-by: Lunny Xiao --- {internal/convert => convert}/bool.go | 0 {internal/convert => convert}/conversion.go | 0 {internal/convert => convert}/float.go | 0 {internal/convert => convert}/int.go | 0 {internal/convert => convert}/interface.go | 0 {internal/convert => convert}/scanner.go | 0 {internal/convert => convert}/string.go | 0 {internal/convert => convert}/time.go | 0 {internal/convert => convert}/time_test.go | 0 integrations/session_get_test.go | 2 +- integrations/types_test.go | 2 +- internal/statements/statement.go | 2 +- internal/statements/update.go | 2 +- internal/statements/values.go | 2 +- scan.go | 2 +- session.go | 2 +- session_find.go | 2 +- session_get.go | 2 +- session_insert.go | 2 +- tags/parser.go | 2 +- 20 files changed, 11 insertions(+), 11 deletions(-) rename {internal/convert => convert}/bool.go (100%) rename {internal/convert => convert}/conversion.go (100%) rename {internal/convert => convert}/float.go (100%) rename {internal/convert => convert}/int.go (100%) rename {internal/convert => convert}/interface.go (100%) rename {internal/convert => convert}/scanner.go (100%) rename {internal/convert => convert}/string.go (100%) rename {internal/convert => convert}/time.go (100%) rename {internal/convert => convert}/time_test.go (100%) diff --git a/internal/convert/bool.go b/convert/bool.go similarity index 100% rename from internal/convert/bool.go rename to convert/bool.go diff --git a/internal/convert/conversion.go b/convert/conversion.go similarity index 100% rename from internal/convert/conversion.go rename to convert/conversion.go diff --git a/internal/convert/float.go b/convert/float.go similarity index 100% rename from internal/convert/float.go rename to convert/float.go diff --git a/internal/convert/int.go b/convert/int.go similarity index 100% rename from internal/convert/int.go rename to convert/int.go diff --git a/internal/convert/interface.go b/convert/interface.go similarity index 100% rename from internal/convert/interface.go rename to convert/interface.go diff --git a/internal/convert/scanner.go b/convert/scanner.go similarity index 100% rename from internal/convert/scanner.go rename to convert/scanner.go diff --git a/internal/convert/string.go b/convert/string.go similarity index 100% rename from internal/convert/string.go rename to convert/string.go diff --git a/internal/convert/time.go b/convert/time.go similarity index 100% rename from internal/convert/time.go rename to convert/time.go diff --git a/internal/convert/time_test.go b/convert/time_test.go similarity index 100% rename from internal/convert/time_test.go rename to convert/time_test.go diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go index c0376c70..99ecd462 100644 --- a/integrations/session_get_test.go +++ b/integrations/session_get_test.go @@ -14,7 +14,7 @@ import ( "xorm.io/xorm" "xorm.io/xorm/contexts" - "xorm.io/xorm/internal/convert" + "xorm.io/xorm/convert" "xorm.io/xorm/schemas" "github.com/shopspring/decimal" diff --git a/integrations/types_test.go b/integrations/types_test.go index 4bdbb6fe..b08dfec5 100644 --- a/integrations/types_test.go +++ b/integrations/types_test.go @@ -13,7 +13,7 @@ import ( "testing" "xorm.io/xorm" - "xorm.io/xorm/internal/convert" + "xorm.io/xorm/convert" "xorm.io/xorm/internal/json" "xorm.io/xorm/schemas" diff --git a/internal/statements/statement.go b/internal/statements/statement.go index adbeb1c2..1fcc0bba 100644 --- 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" diff --git a/internal/statements/update.go b/internal/statements/update.go index a8a174f9..40159e0c 100644 --- 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" diff --git a/internal/statements/values.go b/internal/statements/values.go index 7351fb79..4c1360ed 100644 --- 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" ) diff --git a/scan.go b/scan.go index b712f18a..56d3c9d6 100644 --- 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" ) diff --git a/session.go b/session.go index 339aa73f..563dfaf2 100644 --- a/session.go +++ b/session.go @@ -19,8 +19,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" diff --git a/session_find.go b/session_find.go index 82a302b7..df3bd85d 100644 --- a/session_find.go +++ b/session_find.go @@ -10,7 +10,7 @@ import ( "xorm.io/builder" "xorm.io/xorm/caches" - "xorm.io/xorm/internal/convert" + "xorm.io/xorm/convert" "xorm.io/xorm/internal/statements" "xorm.io/xorm/internal/utils" "xorm.io/xorm/schemas" diff --git a/session_get.go b/session_get.go index 617ca169..08172524 100644 --- 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" ) diff --git a/session_insert.go b/session_insert.go index 78f0e555..a8f365c7 100644 --- a/session_insert.go +++ b/session_insert.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "xorm.io/xorm/convert" "xorm.io/xorm/dialects" - "xorm.io/xorm/internal/convert" "xorm.io/xorm/internal/utils" "xorm.io/xorm/schemas" ) diff --git a/tags/parser.go b/tags/parser.go index 989ac7f9..efee11e7 100644 --- a/tags/parser.go +++ b/tags/parser.go @@ -15,8 +15,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" )