From 35a18b5af9851a6483d01430b32ee8b667e805f3 Mon Sep 17 00:00:00 2001 From: tangpanqing Date: Thu, 12 Jan 2023 13:11:09 +0800 Subject: [PATCH] update --- builder/builder.go | 12 ++++++------ builder/cache.go | 4 ++-- builder/having.go | 4 ++-- builder/where.go | 4 ++-- migrate_mssql/migrate.go | 6 +++--- migrate_mysql/migrate.go | 6 +++--- migrate_postgres/migrate.go | 6 +++--- migrate_sqlite3/migrate.go | 6 +++--- migrator/migrator.go | 4 ++-- {helper => utils}/str.go | 7 +------ 10 files changed, 27 insertions(+), 32 deletions(-) rename {helper => utils}/str.go (87%) diff --git a/builder/builder.go b/builder/builder.go index f8b97bf..8c5541b 100644 --- a/builder/builder.go +++ b/builder/builder.go @@ -2,7 +2,7 @@ package builder import ( "fmt" - "github.com/tangpanqing/aorm/helper" + "github.com/tangpanqing/aorm/utils" "reflect" "strings" ) @@ -98,7 +98,7 @@ func getPrefixByField(field interface{}, prefix ...string) string { tableName := getTableMap(tablePointer) strArr := strings.Split(tableName, ".") - str = helper.UnderLine(strArr[len(strArr)-1]) + str = utils.UnderLine(strArr[len(strArr)-1]) } else { str = fmt.Sprintf("%v", field) } @@ -117,7 +117,7 @@ func getTableNameByTable(table interface{}) string { if reflect.Ptr == valueOf.Kind() { tableName := getTableMap(valueOf.Pointer()) strArr := strings.Split(tableName, ".") - return helper.UnderLine(strArr[len(strArr)-1]) + return utils.UnderLine(strArr[len(strArr)-1]) } else { return fmt.Sprintf("%v", table) } @@ -127,7 +127,7 @@ func getTableNameByTable(table interface{}) string { func getFieldName(field interface{}) string { valueOf := reflect.ValueOf(field) if reflect.Ptr == valueOf.Kind() { - return helper.UnderLine(getFieldMap(reflect.ValueOf(field).Pointer()).Name) + return utils.UnderLine(getFieldMap(reflect.ValueOf(field).Pointer()).Name) } else { return fmt.Sprintf("%v", field) } @@ -143,7 +143,7 @@ func getTableNameByReflect(typeOf reflect.Type, valueOf reflect.Value) string { return res[0].String() } else { arr := strings.Split(typeOf.String(), ".") - return helper.UnderLine(arr[len(arr)-1]) + return utils.UnderLine(arr[len(arr)-1]) } } @@ -161,7 +161,7 @@ func getFieldMapByReflect(destValue reflect.Value, destType reflect.Type) map[st func getScansAddr(columnNameList []string, fieldNameMap map[string]int, destValue reflect.Value) []interface{} { var scans []interface{} for _, columnName := range columnNameList { - fieldName := helper.CamelString(strings.ToLower(columnName)) + fieldName := utils.CamelString(strings.ToLower(columnName)) index, ok := fieldNameMap[fieldName] if ok { scans = append(scans, destValue.Field(index).Addr().Interface()) diff --git a/builder/cache.go b/builder/cache.go index f364562..e7b8c57 100644 --- a/builder/cache.go +++ b/builder/cache.go @@ -1,7 +1,7 @@ package builder import ( - "github.com/tangpanqing/aorm/helper" + "github.com/tangpanqing/aorm/utils" "reflect" ) @@ -52,7 +52,7 @@ func getFieldMap(fieldPointer uintptr) FieldInfo { } func getFieldNameByReflect(field reflect.StructField) (string, map[string]string) { - key := helper.UnderLine(field.Name) + key := utils.UnderLine(field.Name) tag := field.Tag.Get("aorm") tagMap := getTagMap(tag) if column, ok := tagMap["column"]; ok { diff --git a/builder/having.go b/builder/having.go index a633faf..24cfa90 100644 --- a/builder/having.go +++ b/builder/having.go @@ -1,7 +1,7 @@ package builder import ( - "github.com/tangpanqing/aorm/helper" + "github.com/tangpanqing/aorm/utils" "reflect" ) @@ -18,7 +18,7 @@ func (b *Builder) Having(dest interface{}) *Builder { for i := 0; i < typeOf.Elem().NumField(); i++ { isNotNull := valueOf.Elem().Field(i).Field(0).Field(1).Bool() if isNotNull { - key := helper.UnderLine(typeOf.Elem().Field(i).Name) + key := utils.UnderLine(typeOf.Elem().Field(i).Name) val := valueOf.Elem().Field(i).Field(0).Field(0).Interface() b.havingList = append(b.havingList, WhereItem{Field: key, Opt: Eq, Val: val}) } diff --git a/builder/where.go b/builder/where.go index ef0186e..32a7af0 100644 --- a/builder/where.go +++ b/builder/where.go @@ -1,7 +1,7 @@ package builder import ( - "github.com/tangpanqing/aorm/helper" + "github.com/tangpanqing/aorm/utils" "reflect" ) @@ -18,7 +18,7 @@ func (b *Builder) Where(dest interface{}) *Builder { for i := 0; i < typeOf.Elem().NumField(); i++ { isNotNull := valueOf.Elem().Field(i).Field(0).Field(1).Bool() if isNotNull { - key := helper.UnderLine(typeOf.Elem().Field(i).Name) + key := utils.UnderLine(typeOf.Elem().Field(i).Name) val := valueOf.Elem().Field(i).Field(0).Field(0).Interface() b.whereList = append(b.whereList, WhereItem{Field: key, Opt: Eq, Val: val}) } diff --git a/migrate_mssql/migrate.go b/migrate_mssql/migrate.go index df9a51c..67fc830 100644 --- a/migrate_mssql/migrate.go +++ b/migrate_mssql/migrate.go @@ -3,8 +3,8 @@ package migrate_mssql import ( "fmt" "github.com/tangpanqing/aorm/builder" - "github.com/tangpanqing/aorm/helper" "github.com/tangpanqing/aorm/null" + "github.com/tangpanqing/aorm/utils" "reflect" "strconv" "strings" @@ -78,7 +78,7 @@ func (mm *MigrateExecutor) getTableFromCode(tableName string) Table { func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { var columnsFromCode []Column for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldType := typeOf.Elem().Field(i).Type.Name() fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) columnsFromCode = append(columnsFromCode, Column{ @@ -98,7 +98,7 @@ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { func (mm *MigrateExecutor) getIndexesFromCode(typeOf reflect.Type, tableFromCode Table) []Index { var indexesFromCode []Index for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) _, primaryIs := fieldMap["primary"] diff --git a/migrate_mysql/migrate.go b/migrate_mysql/migrate.go index 6e3d72c..410c92b 100644 --- a/migrate_mysql/migrate.go +++ b/migrate_mysql/migrate.go @@ -3,8 +3,8 @@ package migrate_mysql import ( "fmt" "github.com/tangpanqing/aorm/builder" - "github.com/tangpanqing/aorm/helper" "github.com/tangpanqing/aorm/null" + "github.com/tangpanqing/aorm/utils" "reflect" "strconv" "strings" @@ -96,7 +96,7 @@ func (mm *MigrateExecutor) getTableFromCode(tableName string, typeOf reflect.Typ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { var columnsFromCode []Column for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldType := typeOf.Elem().Field(i).Type.Name() fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) @@ -122,7 +122,7 @@ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { func (mm *MigrateExecutor) getIndexesFromCode(typeOf reflect.Type, tableFromCode Table) []Index { var indexesFromCode []Index for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) _, primaryIs := fieldMap["primary"] diff --git a/migrate_postgres/migrate.go b/migrate_postgres/migrate.go index fed29dd..e322543 100644 --- a/migrate_postgres/migrate.go +++ b/migrate_postgres/migrate.go @@ -3,8 +3,8 @@ package migrate_postgres import ( "fmt" "github.com/tangpanqing/aorm/builder" - "github.com/tangpanqing/aorm/helper" "github.com/tangpanqing/aorm/null" + "github.com/tangpanqing/aorm/utils" "reflect" "regexp" "strconv" @@ -102,7 +102,7 @@ func (mm *MigrateExecutor) getTableFromCode(tableName string, typeOf reflect.Typ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { var columnsFromCode []Column for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldType := typeOf.Elem().Field(i).Type.Name() fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) columnsFromCode = append(columnsFromCode, Column{ @@ -122,7 +122,7 @@ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { func (mm *MigrateExecutor) getIndexesFromCode(typeOf reflect.Type, tableFromCode Table) []Index { var indexesFromCode []Index for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) _, primaryIs := fieldMap["primary"] diff --git a/migrate_sqlite3/migrate.go b/migrate_sqlite3/migrate.go index 12c3487..f3cd053 100644 --- a/migrate_sqlite3/migrate.go +++ b/migrate_sqlite3/migrate.go @@ -3,8 +3,8 @@ package migrate_sqlite3 import ( "fmt" "github.com/tangpanqing/aorm/builder" - "github.com/tangpanqing/aorm/helper" "github.com/tangpanqing/aorm/null" + "github.com/tangpanqing/aorm/utils" "reflect" "regexp" "strconv" @@ -86,7 +86,7 @@ func (mm *MigrateExecutor) getTableFromCode(tableName string) Table { func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { var columnsFromCode []Column for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldType := typeOf.Elem().Field(i).Type.Name() fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) columnsFromCode = append(columnsFromCode, Column{ @@ -105,7 +105,7 @@ func (mm *MigrateExecutor) getColumnsFromCode(typeOf reflect.Type) []Column { func (mm *MigrateExecutor) getIndexesFromCode(typeOf reflect.Type, tableFromCode Table) []Index { var indexesFromCode []Index for i := 0; i < typeOf.Elem().NumField(); i++ { - fieldName := helper.UnderLine(typeOf.Elem().Field(i).Name) + fieldName := utils.UnderLine(typeOf.Elem().Field(i).Name) fieldMap := getTagMap(typeOf.Elem().Field(i).Tag.Get("aorm")) _, primaryIs := fieldMap["primary"] diff --git a/migrator/migrator.go b/migrator/migrator.go index a17df87..62b4bdb 100644 --- a/migrator/migrator.go +++ b/migrator/migrator.go @@ -3,12 +3,12 @@ package migrator import ( "github.com/tangpanqing/aorm/builder" "github.com/tangpanqing/aorm/driver" - "github.com/tangpanqing/aorm/helper" "github.com/tangpanqing/aorm/migrate_mssql" "github.com/tangpanqing/aorm/migrate_mysql" "github.com/tangpanqing/aorm/migrate_postgres" "github.com/tangpanqing/aorm/migrate_sqlite3" "github.com/tangpanqing/aorm/model" + "github.com/tangpanqing/aorm/utils" "reflect" "strings" ) @@ -97,6 +97,6 @@ func getTableNameByReflect(typeOf reflect.Type, valueOf reflect.Value) string { return res[0].String() } else { arr := strings.Split(typeOf.String(), ".") - return helper.UnderLine(arr[len(arr)-1]) + return utils.UnderLine(arr[len(arr)-1]) } } diff --git a/helper/str.go b/utils/str.go similarity index 87% rename from helper/str.go rename to utils/str.go index 7fab0d3..9d22a95 100644 --- a/helper/str.go +++ b/utils/str.go @@ -1,4 +1,4 @@ -package helper +package utils import ( "unicode" @@ -44,8 +44,3 @@ func UnderLine(s string) string { } return string(output) } - -// Ul 将某字符串转成下划线写法-简化用法 -func Ul(s string) string { - return UnderLine(s) -}