From 6d81aa4462d3483ac1a60212ecf72079ee81caa3 Mon Sep 17 00:00:00 2001
From: jflyfox <zcool321@sina.com>
Date: Fri, 21 May 2021 15:38:56 +0800
Subject: [PATCH] infract internal link

---
 database/gdb/gdb_core.go          |  7 +------
 database/gdb/gdb_model_utility.go | 13 +------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/database/gdb/gdb_core.go b/database/gdb/gdb_core.go
index 9c0786935..6aa55414c 100644
--- a/database/gdb/gdb_core.go
+++ b/database/gdb/gdb_core.go
@@ -23,6 +23,7 @@ import (
 	"github.com/gogf/gf/util/gconv"
 )
 
+// GetCore returns the underlying *Core object.
 func (c *Core) GetCore() *Core {
 	return c
 }
@@ -122,12 +123,6 @@ func (c *Core) GetAll(sql string, args ...interface{}) (Result, error) {
 
 // DoGetAll queries and returns data records from database.
 func (c *Core) DoGetAll(ctx context.Context, link Link, sql string, args ...interface{}) (result Result, err error) {
-	if link == nil {
-		link, err = c.SlaveLink()
-		if err != nil {
-			return nil, err
-		}
-	}
 	rows, err := c.DoQuery(ctx, link, sql, args...)
 	if err != nil || rows == nil {
 		return nil, err
diff --git a/database/gdb/gdb_model_utility.go b/database/gdb/gdb_model_utility.go
index 9efee81cf..362219965 100644
--- a/database/gdb/gdb_model_utility.go
+++ b/database/gdb/gdb_model_utility.go
@@ -24,18 +24,7 @@ import (
 //
 // Also see DriverMysql.TableFields.
 func (m *Model) TableFields(table string, schema ...string) (fields map[string]*TableField, err error) {
-	var (
-		link Link
-	)
-	if m.tx != nil {
-		link = &txLink{m.tx.tx}
-	} else {
-		link, err = m.db.GetCore().SlaveLink(schema...)
-		if err != nil {
-			return
-		}
-	}
-	return m.db.TableFields(m.GetCtx(), link, table, schema...)
+	return m.db.TableFields(m.GetCtx(), m.getLink(false), table, schema...)
 }
 
 // getModel creates and returns a cloned model of current model if `safe` is true, or else it returns