From 742653ce75121b02060b6b92e9f550c57ff1396a Mon Sep 17 00:00:00 2001 From: John Guo Date: Sun, 2 May 2021 23:28:24 +0800 Subject: [PATCH] improve Model function for struct parameter that can retrieve table name tag from --- database/gdb/gdb_model.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/database/gdb/gdb_model.go b/database/gdb/gdb_model.go index f345ad857..ba834a457 100644 --- a/database/gdb/gdb_model.go +++ b/database/gdb/gdb_model.go @@ -83,21 +83,16 @@ func (c *Core) Table(tableNameOrStruct ...interface{}) *Model { // Model("user u, user_detail ud") // 2. Model name with alias: Model("user", "u") func (c *Core) Model(tableNameOrStruct ...interface{}) *Model { - // With feature checks. - if len(tableNameOrStruct) > 0 { - if _, ok := tableNameOrStruct[0].(string); !ok { - return c.With(tableNameOrStruct...) - } - } - // Normal model creation. var ( tableStr = "" + tableName = "" tableNames = make([]string, len(tableNameOrStruct)) ) for k, v := range tableNameOrStruct { if s, ok := v.(string); ok { tableNames[k] = s - continue + } else if tableName = getTableNameFromOrmTag(v); tableName != "" { + tableNames[k] = tableName } }