reafactor: modify modeName and tag name (#14)

afumu · web-flow · commit c87075647506 · 2022-07-21T21:36:52.000+08:00
* chore: modify License

* refactor: modify modeName and tag name
diff --git a/README.md b/README.md
@@ -77,18 +77,18 @@ if err != nil {
 
 ### 2、定义Model
 
-使用tag（"xfield"）定义struct，tag指定数据库表中的column name。
+使用tag（"column"）定义struct，tag指定数据库表中的column name。
 
 ```
 type TestTable struct {
     //指定table name
     TestTable gobatis.ModelName "test_table"
     //指定表字段id
-    Id        int64             `xfield:"id"`
+    Id        int64             `column:"id"`
     //指定表字段username
-    Username  string            `xfield:"username"`
+    Username  string            `column:"username"`
     //指定表字段password
-    Password  string            `xfield:"password"`
+    Password  string            `column:"password"`
 }
 ```
 
diff --git a/common/define.go b/common/define.go
@@ -25,5 +25,5 @@ package common
 type IterFunc func(idx int64, bean interface{}) bool
 
 const (
-	FieldName = "xfield"
+	ColumnName = "column"
 )
diff --git a/init.go b/init.go
@@ -24,6 +24,6 @@ import (
 )
 
 func init() {
-	var typeModelName ModelName
+	var typeModelName TableName
 	reflection.SetModelNameType(reflect.TypeOf(typeModelName))
 }
diff --git a/objectmanager.go b/objectmanager.go
@@ -24,7 +24,7 @@ import (
 	"github.com/acmestack/gobatis/reflection"
 )
 
-type ModelName string
+type TableName string
 
 type ObjectCache struct {
 	objCache map[string]reflection.Object
diff --git a/reflection/object.go b/reflection/object.go
@@ -460,10 +460,10 @@ func GetReflectMapInfo(rt reflect.Type, rv reflect.Value) (Object, error) {
 // a)、如果含有tag，则使用tag作为tablename；
 // b)、如果不含有tag，则使用fieldName作为tablename。
 //2、如果结构体中不含有gobatis.ModelName类型的字段，则使用结构体名称作为tablename
-//3、如果结构体中含有xfield的tag，则：
+//3、如果结构体中含有column的tag，则：
 // a）、如果tag为‘-’，则不进行columne与field的映射；
 // b）、如果tag不为‘-’使用tag name作为column名称与field映射。
-//4、如果结构体中不含有xfield的tag，则使用field name作为column名称与field映射
+//4、如果结构体中不含有column的tag，则使用field name作为column名称与field映射
 //5、如果字段的tag为‘-’，则不进行columne与field的映射；
 func GetStructInfo(bean interface{}) (*StructInfo, error) {
 	return GetReflectStructInfo(reflect.TypeOf(bean), reflect.ValueOf(bean))
@@ -515,7 +515,7 @@ func GetReflectStructInfo(rt reflect.Type, rv reflect.Value) (*StructInfo, error
 		}
 
 		fieldName := rtf.Name
-		tagName := rtf.Tag.Get(common.FieldName)
+		tagName := rtf.Tag.Get(common.ColumnName)
 		if tagName == "-" {
 			continue
 		} else if tagName != "" {
diff --git a/test/cmd/test_table.go b/test/cmd/test_table.go
@@ -23,11 +23,11 @@ import (
 )
 
 type TestTable struct {
-	//TableName gobatis.ModelName `test_table`
-	Id         int       `xfield:"id"`
-	Username   string    `xfield:"username"`
-	Password   string    `xfield:"password"`
-	Createtime time.Time `xfield:"createtime"`
+	//TableName gobatis.TableName `test_table`
+	Id         int       `column:"id"`
+	Username   string    `column:"username"`
+	Password   string    `column:"password"`
+	Createtime time.Time `column:"createtime"`
 }
 
 func (m *TestTable) Select(sess *gobatis.Session) ([]TestTable, error) {
diff --git a/test/mysql/runner_test.go b/test/mysql/runner_test.go
@@ -30,10 +30,10 @@ import (
 )
 
 type TestTable struct {
-	TestTable gobatis.ModelName "test_table"
-	Id        int64             `xfield:"id"`
-	Username  string            `xfield:"username"`
-	Password  string            `xfield:"password"`
+	TestTable gobatis.TableName "test_table"
+	Id        int64             `column:"id"`
+	Username  string            `column:"username"`
+	Password  string            `column:"password"`
 }
 
 func (t *TestTable) String() string {
diff --git a/test/postgresql/runner_test.go b/test/postgresql/runner_test.go
@@ -29,10 +29,10 @@ import (
 )
 
 type TestTable struct {
-	TestTable gobatis.ModelName "test_table"
-	Id        int64             `xfield:"id"`
-	Username  string            `xfield:"username"`
-	Password  string            `xfield:"password"`
+	TestTable gobatis.TableName "test_table"
+	Id        int64             `column:"id"`
+	Username  string            `column:"username"`
+	Password  string            `column:"password"`
 }
 
 func (t *TestTable) String() string {
diff --git a/test/reflection_test.go b/test/reflection_test.go
@@ -27,9 +27,9 @@ import (
 )
 
 type TestStruct1 struct {
-	TestTable gobatis.ModelName "test_table"
-	Username  string            `xfield:"username"`
-	Password  string            `xfield:"password"`
+	TestTable gobatis.TableName "test_table"
+	Username  string            `column:"username"`
+	Password  string            `column:"password"`
 }
 
 func TestReflection1(t *testing.T) {
@@ -39,8 +39,8 @@ func TestReflection1(t *testing.T) {
 }
 
 type TestStruct2 struct {
-	TestTable gobatis.ModelName
-	Username  string `xfield:"-"`
+	TestTable gobatis.TableName
+	Username  string `column:"-"`
 	Password  string `-`
 }
 
@@ -134,7 +134,7 @@ func TestReflectionParseMap(t *testing.T) {
 }
 
 type testParseStruct struct {
-	Name     gobatis.ModelName `parse_struct`
+	Name     gobatis.TableName `parse_struct`
 	Username string
 	Password string
 }
diff --git a/test/runner_test.go b/test/runner_test.go
@@ -26,10 +26,10 @@ import (
 )
 
 type TestTable struct {
-	TestTable gobatis.ModelName "test_table"
-	Id        int64             `xfield:"id"`
-	Username  string            `xfield:"username"`
-	Password  string            `xfield:"password"`
+	TestTable gobatis.TableName "test_table"
+	Id        int64             `column:"id"`
+	Username  string            `column:"username"`
+	Password  string            `column:"password"`
 }
 
 func connect() factory.Factory {
diff --git a/test/sql_test.go b/test/sql_test.go
@@ -25,9 +25,9 @@ import (
 )
 
 type SqlTest struct {
-	Id       int64  `xfield:"id"`
-	Username string `xfield:"username"`
-	Password string `xfield:"password"`
+	Id       int64  `column:"id"`
+	Username string `column:"username"`
+	Password string `column:"password"`
 }
 
 var sessionMgr *gobatis.SessionManager
diff --git a/test/sqlite/runner_test.go b/test/sqlite/runner_test.go
@@ -29,10 +29,10 @@ import (
 )
 
 type TestTable struct {
-	TestTable gobatis.ModelName "test_table"
-	Id        int64             `xfield:"id"`
-	Username  string            `xfield:"username"`
-	Password  string            `xfield:"password"`
+	TestTable gobatis.TableName "test_table"
+	Id        int64             `column:"id"`
+	Username  string            `column:"username"`
+	Password  string            `column:"password"`
 }
 
 func (t *TestTable) String() string {
diff --git a/test/sqlparse_test.go b/test/sqlparse_test.go
@@ -178,9 +178,9 @@ func TestSqlParserWithParamMap3(t *testing.T) {
 }
 
 type TestSqlParserStruct struct {
-	TestTable gobatis.ModelName "test_table"
-	Id        int               `xfield:"id"`
-	Name      string            `xfield:"name"`
+	TestTable gobatis.TableName "test_table"
+	Id        int               `column:"id"`
+	Name      string            `column:"name"`
 }
 
 func TestSqlParserWithParamMap4(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ package common`
`25`	`25`	`type IterFunc func(idx int64, bean interface{}) bool`
`26`	`26`
`27`	`27`	`const (`
`28`		`- FieldName = "xfield"`
	`28`	`+ ColumnName = "column"`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func init() {`
`27`		`- var typeModelName ModelName`
	`27`	`+ var typeModelName TableName`
`28`	`28`	`reflection.SetModelNameType(reflect.TypeOf(typeModelName))`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"github.com/acmestack/gobatis/reflection"`
`25`	`25`	`)`
`26`	`26`
`27`		`-type ModelName string`
	`27`	`+type TableName string`
`28`	`28`
`29`	`29`	`type ObjectCache struct {`
`30`	`30`	`objCache map[string]reflection.Object`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ import (`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`type TestTable struct {`
`33`		`- TestTable gobatis.ModelName "test_table"`
`34`		- Id int64 `xfield:"id"`
`35`		- Username string `xfield:"username"`
`36`		- Password string `xfield:"password"`
	`33`	`+ TestTable gobatis.TableName "test_table"`
	`34`	+ Id int64 `column:"id"`
	`35`	+ Username string `column:"username"`
	`36`	+ Password string `column:"password"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (t *TestTable) String() string {`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`type TestTable struct {`
`32`		`- TestTable gobatis.ModelName "test_table"`
`33`		- Id int64 `xfield:"id"`
`34`		- Username string `xfield:"username"`
`35`		- Password string `xfield:"password"`
	`32`	`+ TestTable gobatis.TableName "test_table"`
	`33`	+ Id int64 `column:"id"`
	`34`	+ Username string `column:"username"`
	`35`	+ Password string `column:"password"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func (t *TestTable) String() string {`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`type TestStruct1 struct {`
`30`		`- TestTable gobatis.ModelName "test_table"`
`31`		- Username string `xfield:"username"`
`32`		- Password string `xfield:"password"`
	`30`	`+ TestTable gobatis.TableName "test_table"`
	`31`	+ Username string `column:"username"`
	`32`	+ Password string `column:"password"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func TestReflection1(t *testing.T) {`
`@@ -39,8 +39,8 @@ func TestReflection1(t *testing.T) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`type TestStruct2 struct {`
`42`		`- TestTable gobatis.ModelName`
`43`		- Username string `xfield:"-"`
	`42`	`+ TestTable gobatis.TableName`
	`43`	+ Username string `column:"-"`
`44`	`44`	Password string `-`
`45`	`45`	`}`
`46`	`46`
`@@ -134,7 +134,7 @@ func TestReflectionParseMap(t *testing.T) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`type testParseStruct struct {`
`137`		- Name gobatis.ModelName `parse_struct`
	`137`	+ Name gobatis.TableName `parse_struct`
`138`	`138`	`Username string`
`139`	`139`	`Password string`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`type TestTable struct {`
`29`		`- TestTable gobatis.ModelName "test_table"`
`30`		- Id int64 `xfield:"id"`
`31`		- Username string `xfield:"username"`
`32`		- Password string `xfield:"password"`
	`29`	`+ TestTable gobatis.TableName "test_table"`
	`30`	+ Id int64 `column:"id"`
	`31`	+ Username string `column:"username"`
	`32`	+ Password string `column:"password"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func connect() factory.Factory {`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`type SqlTest struct {`
`28`		- Id int64 `xfield:"id"`
`29`		- Username string `xfield:"username"`
`30`		- Password string `xfield:"password"`
	`28`	+ Id int64 `column:"id"`
	`29`	+ Username string `column:"username"`
	`30`	+ Password string `column:"password"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var sessionMgr *gobatis.SessionManager`
Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,9 @@ func TestSqlParserWithParamMap3(t *testing.T) {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`type TestSqlParserStruct struct {`
`181`		`- TestTable gobatis.ModelName "test_table"`
`182`		- Id int `xfield:"id"`
`183`		- Name string `xfield:"name"`
	`181`	`+ TestTable gobatis.TableName "test_table"`
	`182`	+ Id int `column:"id"`
	`183`	+ Name string `column:"name"`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`func TestSqlParserWithParamMap4(t *testing.T) {`