From 7cb5fbe684c5675364037bebbf2edd0aca69287c Mon Sep 17 00:00:00 2001 From: John Guo Date: Sat, 8 Oct 2022 21:42:30 +0800 Subject: [PATCH] fix issue #1965 (#2177) --- database/gdb/gdb_driver_wrapper_db.go | 7 ++++++- database/gdb/gdb_model_utility.go | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/database/gdb/gdb_driver_wrapper_db.go b/database/gdb/gdb_driver_wrapper_db.go index a29bb2226..1a35dd746 100644 --- a/database/gdb/gdb_driver_wrapper_db.go +++ b/database/gdb/gdb_driver_wrapper_db.go @@ -47,7 +47,12 @@ func (d *DriverWrapperDB) Tables(ctx context.Context, schema ...string) (tables // // It's using cache feature to enhance the performance, which is never expired util the // process restarts. -func (d *DriverWrapperDB) TableFields(ctx context.Context, table string, schema ...string) (fields map[string]*TableField, err error) { +func (d *DriverWrapperDB) TableFields( + ctx context.Context, table string, schema ...string, +) (fields map[string]*TableField, err error) { + if table == "" { + return nil, nil + } charL, charR := d.GetChars() table = gstr.Trim(table, charL+charR) if gstr.Contains(table, " ") { diff --git a/database/gdb/gdb_model_utility.go b/database/gdb/gdb_model_utility.go index c5dd0dfa2..e78ef9724 100644 --- a/database/gdb/gdb_model_utility.go +++ b/database/gdb/gdb_model_utility.go @@ -35,11 +35,6 @@ func (m *Model) TableFields(tableStr string, schema ...string) (fields map[strin table = m.db.GetCore().guessPrimaryTableName(tableStr) usedSchema = gutil.GetOrDefaultStr(m.schema, schema...) ) - - if table == "" { - return nil, nil - } - return m.db.TableFields(m.GetCtx(), table, usedSchema) }