blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

improve tag and field retrieving feature for internal/structs; comment update for gdb

Browse Source
This commit is contained in:
John 2019-12-12 23:38:46 +08:00
parent 4374996073
commit e3f54e1353
10 changed files with 455 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.example/frame/mvc/app/model/defaults/user.go
View File

@ -1,60 +0,0 @@
// This is auto-generated by gf cli tool. You may not really want to edit it.
package defaults
import (
"database/sql"
"github.com/gogf/gf/database/gdb"
"github.com/gogf/gf/frame/g"
)
import (
"github.com/gogf/gf/os/gtime"
)
// User is the golang structure for table user.
type User struct {
Id int `orm:"id,primary" json:"id"`
Passport string `orm:"passport" json:"passport"`
Password string `orm:"password" json:"password"`
Nickname string `orm:"nickname,unique" json:"nickname"`
CreateTime *gtime.Time `orm:"create_time" json:"create_time"`
}
var (
// TableUser is the table name of user.
TableUser = "user"
// ModelUser is the model object of user.
ModelUser = g.DB("default").Table(TableUser).Safe()
)
// Inserts does "INSERT...INTO..." statement for inserting current object into table.
func (r *User) Insert() (result sql.Result, err error) {
return ModelUser.Data(r).Insert()
}
// Replace does "REPLACE...INTO..." statement for inserting current object into table.
// If there's already another same record in the table (it checks using primary key or unique index),
// it deletes it and insert this one.
func (r *User) Replace() (result sql.Result, err error) {
return ModelUser.Data(r).Replace()
}
// Save does "INSERT...INTO..." statement for inserting/updating current object into table.
// It updates the record if there's already another same record in the table
// (it checks using primary key or unique index).
func (r *User) Save() (result sql.Result, err error) {
return ModelUser.Data(r).Save()
}
// Update does "UPDATE...WHERE..." statement for updating current object from table.
// It updates the record if there's already another same record in the table
// (it checks using primary key or unique index).
func (r *User) Update() (result sql.Result, err error) {
return ModelUser.Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
}
// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
func (r *User) Delete() (result sql.Result, err error) {
return ModelUser.Where(gdb.GetWhereConditionOfStruct(r)).Delete()
}

2
.example/frame/mvc/config.toml
View File

@ -3,7 +3,7 @@ viewpath = "/home/www/templates"
# MySQL数据库配置
[database]
debug = true
link = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
link = "mysql:root:12345678@tcp(127.0.0.1:3306)/gf"
[redis]

3
database/gdb/gdb.go
View File

@ -141,13 +141,14 @@ type Sql struct {
// 表字段结构信息
type TableField struct {
Index int // 用于字段排序(map类型是无序的)
Index int // 用于字段排序(因为map类型是无序的)
Name string // 字段名称
Type string // 字段类型
Null bool // 是否可为null
Key string // 索引信息
Default interface{} // 默认值
Extra string // 其他信息
Comment string // 字段描述
}
// 返回数据表记录值

12
database/gdb/gdb_func.go
View File

@ -24,17 +24,17 @@ import (
"github.com/gogf/gf/util/gconv"
)
// Type assert api for String.
// apiString is the type assert api for String.
type apiString interface {
String() string
}
// Type assert api for Iterator.
// apiIterator is the type assert api for Iterator.
type apiIterator interface {
Iterator(f func(key, value interface{}) bool)
}
// Type assert api for Interfaces.
// apiInterfacesis the type assert api for Interfaces.
type apiInterfaces interface {
Interfaces() []interface{}
}
@ -48,15 +48,15 @@ const (
// 获得struct对象对应的where查询条件
func GetWhereConditionOfStruct(pointer interface{}) (where string, args []interface{}) {
array := ([]string)(nil)
for tag, field := range structs.TagMapField(pointer, []string{ORM_TAG_FOR_STRUCT}, true) {
array = strings.Split(tag, ",")
for _, field := range structs.TagFields(pointer, []string{ORM_TAG_FOR_STRUCT}, true) {
array = strings.Split(field.Tag, ",")
if len(array) > 1 && gstr.InArray([]string{ORM_TAG_FOR_UNIQUE, ORM_TAG_FOR_PRIMARY}, array[1]) {
return array[0], []interface{}{field.Value()}
}
if len(where) > 0 {
where += " "
}
where += tag + "=?"
where += field.Tag + "=?"
args = append(args, field.Value())
}
return

679
database/gdb/gdb_model.go
View File

File diff suppressed because it is too large Load Diff

3
database/gdb/gdb_structure.go
View File

@ -131,7 +131,7 @@ func (bs *dbBase) TableFields(table string) (fields map[string]*TableField, err
// 缓存不存在时会查询数据表结构，缓存后不过期，直至程序重启(重新部署)
v := bs.cache.GetOrSetFunc("table_fields_"+table, func() interface{} {
result := (Result)(nil)
result, err = bs.GetAll(fmt.Sprintf(`SHOW COLUMNS FROM %s`, bs.db.quoteWord(table)))
result, err = bs.GetAll(fmt.Sprintf(`SHOW FULL COLUMNS FROM %s`, bs.db.quoteWord(table)))
if err != nil {
return nil
}
@ -145,6 +145,7 @@ func (bs *dbBase) TableFields(table string) (fields map[string]*TableField, err
Key: m["Key"].String(),
Default: m["Default"].Val(),
Extra: m["Extra"].String(),
Comment: m["Comment"].String(),
}
}
return fields

2
frame/gmvc/model.go
View File

@ -6,6 +6,6 @@
package gmvc
// MVC模型基类
// Model is the base struct for model.
type Model struct {
}

11
internal/structs/structs.go
View File

@ -7,9 +7,12 @@
// Package structs provides functions for struct conversion.
package structs
import (
"github.com/fatih/structs"
)
import "github.com/fatih/structs"
// Field is alias of structs.Field.
type Field = structs.Field
type Field struct {
*structs.Field
// Retrieved tag name. There might be more than one tags in the field,
// but only one can be retrieved according to calling function rules.
Tag string
}

10
internal/structs/structs_map.go
View File

@ -33,7 +33,10 @@ func MapField(pointer interface{}, priority []string, recursive bool) map[string
if name[0] < byte('A') || name[0] > byte('Z') {
continue
}
fieldMap[name] = field
fieldMap[name] = &Field{
Field: field,
Tag: tag,
}
tag = ""
for _, p := range priority {
tag = field.Tag(p)
@ -42,7 +45,10 @@ func MapField(pointer interface{}, priority []string, recursive bool) map[string
}
}
if tag != "" {
fieldMap[tag] = field
fieldMap[tag] = &Field{
Field: field,
Tag: tag,
}
}
if recursive {
rv := reflect.ValueOf(field.Value())

71
internal/structs/structs_tag.go
View File

@ -12,31 +12,19 @@ import (
"github.com/fatih/structs"
)
// TagMapName retrieves struct tags as map[tag]attribute from <pointer>, and returns it.
// TagFields retrieves struct tags as []*Field from <pointer>, and returns it.
//
// The parameter <recursive> specifies whether retrieving the struct field recursively.
//
// Note that it only retrieves the exported attributes with first letter up-case from struct.
func TagMapName(pointer interface{}, priority []string, recursive bool) map[string]string {
tagMap := TagMapField(pointer, priority, recursive)
if len(tagMap) > 0 {
m := make(map[string]string, len(tagMap))
for k, v := range tagMap {
m[k] = v.Name()
}
return m
}
return nil
func TagFields(pointer interface{}, priority []string, recursive bool) []*Field {
return doTagFields(pointer, priority, recursive, map[string]struct{}{})
}
// TagMapField retrieves struct tags as map[tag]*Field from <pointer>, and returns it.
//
// The parameter <recursive> specifies whether retrieving the struct field recursively.
//
// Note that it only retrieves the exported attributes with first letter up-case from struct.
func TagMapField(pointer interface{}, priority []string, recursive bool) map[string]*Field {
tagMap := make(map[string]*Field)
fields := ([]*structs.Field)(nil)
// doTagFields retrieves the tag and corresponding attribute name from <pointer>. It also filters repeated
// tag internally.
func doTagFields(pointer interface{}, priority []string, recursive bool, tagMap map[string]struct{}) []*Field {
var fields []*structs.Field
if v, ok := pointer.(reflect.Value); ok {
fields = structs.Fields(v.Interface())
} else {
@ -56,13 +44,13 @@ func TagMapField(pointer interface{}, priority []string, recursive bool) map[str
}
tag := ""
name := ""
tagFields := make([]*Field, 0)
for _, field := range fields {
name = field.Name()
// Only retrieve exported attributes.
if name[0] < byte('A') || name[0] > byte('Z') {
continue
}
tag = ""
for _, p := range priority {
tag = field.Tag(p)
@ -71,7 +59,14 @@ func TagMapField(pointer interface{}, priority []string, recursive bool) map[str
}
}
if tag != "" {
tagMap[tag] = field
// Filter repeated tag.
if _, ok := tagMap[tag]; ok {
continue
}
tagFields = append(tagFields, &Field{
Field: field,
Tag: tag,
})
}
if recursive {
rv := reflect.ValueOf(field.Value())
@ -81,13 +76,37 @@ func TagMapField(pointer interface{}, priority []string, recursive bool) map[str
kind = rv.Kind()
}
if kind == reflect.Struct {
for k, v := range TagMapField(rv, priority, true) {
if _, ok := tagMap[k]; !ok {
tagMap[k] = v
}
}
tagFields = append(tagFields, doTagFields(rv, priority, recursive, tagMap)...)
}
}
}
return tagFields
}
// TagMapName retrieves struct tags as map[tag]attribute from <pointer>, and returns it.
//
// The parameter <recursive> specifies whether retrieving the struct field recursively.
//
// Note that it only retrieves the exported attributes with first letter up-case from struct.
func TagMapName(pointer interface{}, priority []string, recursive bool) map[string]string {
fields := TagFields(pointer, priority, recursive)
tagMap := make(map[string]string, len(fields))
for _, v := range fields {
tagMap[v.Tag] = v.Name()
}
return tagMap
}
// TagMapField retrieves struct tags as map[tag]*Field from <pointer>, and returns it.
//
// The parameter <recursive> specifies whether retrieving the struct field recursively.
//
// Note that it only retrieves the exported attributes with first letter up-case from struct.
func TagMapField(pointer interface{}, priority []string, recursive bool) map[string]*Field {
fields := TagFields(pointer, priority, recursive)
tagMap := make(map[string]*Field, len(fields))
for _, v := range fields {
tagMap[v.Tag] = v
}
return tagMap
}