Merge 3923bab3271e9eef8796f7842a078567a442e755 into fee38b4531224b929c095ef643a68a92bbad3d4b

contrib/drivers/dm/dm_do_filter.go

@@ -20,7 +20,7 @@ func (d *Driver) DoFilter(
 	ctx context.Context, link gdb.Link, sql string, args []interface{},
 ) (newSql string, newArgs []interface{}, err error) {
 	// There should be no need to capitalize, because it has been done from field processing before
-	newSql, _ = gregex.ReplaceString(`["\n\t]`, "", sql)
+	newSql, _ = gregex.ReplaceString(`[\n\t]`, "", sql)
 	newSql = gstr.ReplaceI(gstr.ReplaceI(newSql, "GROUP_CONCAT", "LISTAGG"), "SEPARATOR", ",")
 
 	// TODO The current approach is too rough. We should deal with the GROUP_CONCAT function and the

contrib/drivers/dm/dm_table_fields.go

@@ -11,12 +11,19 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/util/gutil"
 )
 
 const (
 	tableFieldsSqlTmp         = `SELECT * FROM ALL_TAB_COLUMNS WHERE Table_Name= '%s' AND OWNER = '%s'`
+	tableFieldsPkSqlSchemaTmp = `SELECT COLS.COLUMN_NAME AS PRIMARY_KEY_COLUMN FROM USER_CONSTRAINTS CONS 
+									JOIN USER_CONS_COLUMNS COLS ON CONS.CONSTRAINT_NAME = COLS.CONSTRAINT_NAME WHERE 
+							   		CONS.TABLE_NAME = '%s' AND CONS.CONSTRAINT_TYPE = 'P'`
+	tableFieldsPkSqlDBATmp = `SELECT COLS.COLUMN_NAME AS PRIMARY_KEY_COLUMN FROM DBA_CONSTRAINTS CONS 
+    								JOIN DBA_CONS_COLUMNS COLS ON CONS.CONSTRAINT_NAME = COLS.CONSTRAINT_NAME WHERE 
+								  	CONS.TABLE_NAME = '%s' AND CONS.OWNER = '%s' AND CONS.CONSTRAINT_TYPE = 'P'`
 )
 
 // TableFields retrieves and returns the fields' information of specified table of current schema.
@@ -25,6 +32,7 @@ func (d *Driver) TableFields(
 ) (fields map[string]*gdb.TableField, err error) {
 	var (
 		result   gdb.Result
+		pkResult gdb.Result
 		link     gdb.Link
 		// When no schema is specified, the configuration item is returned by default
 		usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
@@ -45,7 +53,28 @@ func (d *Driver) TableFields(
 	if err != nil {
 		return nil, err
 	}
+	// Query the primary key field
+	pkResult, err = d.DoSelect(
+		ctx, link,
+		fmt.Sprintf(tableFieldsPkSqlSchemaTmp, strings.ToUpper(table)),
+	)
+	if err != nil {
+		return nil, err
+	}
+	if pkResult.IsEmpty() {
+		pkResult, err = d.DoSelect(
+			ctx, link,
+			fmt.Sprintf(tableFieldsPkSqlDBATmp, strings.ToUpper(table), strings.ToUpper(d.GetSchema())),
+		)
+		if err != nil {
+			return nil, err
+		}
+	}
 	fields = make(map[string]*gdb.TableField)
+	pkFields := gmap.NewStrStrMap()
+	for _, pk := range pkResult {
+		pkFields.Set(pk["PRIMARY_KEY_COLUMN"].String(), "PRI")
+	}
 	for i, m := range result {
 		// m[NULLABLE] returns "N" "Y"
 		// "N" means not null
@@ -60,7 +89,7 @@ func (d *Driver) TableFields(
 			Type:    m["DATA_TYPE"].String(),
 			Null:    nullable,
 			Default: m["DATA_DEFAULT"].Val(),
-			// Key:     m["Key"].String(),
+			Key:     pkFields.Get(m["COLUMN_NAME"].String()),
 			// Extra:   m["Extra"].String(),
 			// Comment: m["Comment"].String(),
 		}

contrib/drivers/dm/dm_z_unit_basic_test.go

@@ -92,7 +92,7 @@ func TestTableFields(t *testing.T) {
 		}
 
 		_, err := dbErr.TableFields(ctx, "Fields")
-		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(err, nil)
 
 		res, err := db.TableFields(ctx, tables)
 		gtest.AssertNil(err)
@@ -138,6 +138,18 @@ func Test_DB_Query(t *testing.T) {
 	})
 }
 
+func Test_DB_WherePri(t *testing.T) {
+	tableName := "A_tables"
+	createInitTable(tableName)
+	gtest.C(t, func(t *gtest.T) {
+		// createTable(tableName)
+		var resOne *User
+		err := db.Model(tableName).WherePri(1).Scan(&resOne)
+		t.AssertNil(err)
+		t.AssertNQ(resOne, nil)
+	})
+}
+
 func TestModelSave(t *testing.T) {
 	table := createTable()
 	defer dropTable(table)

net/ghttp/ghttp_request.go

@@ -151,8 +151,13 @@ func (r *Request) IsExited() bool {
 }
 
 // GetHeader retrieves and returns the header value with given `key`.
-func (r *Request) GetHeader(key string) string {
-	return r.Header.Get(key)
+// It returns the optional `def` parameter if the header does not exist.
+func (r *Request) GetHeader(key string, def ...string) string {
+	value := r.Header.Get(key)
+	if value == "" && len(def) > 0 {
+		value = def[0]
+	}
+	return value
 }
 
 // GetHost returns current request host name, which might be a domain or an IP without port.

net/ghttp/ghttp_z_unit_feature_request_test.go

@@ -363,7 +363,11 @@ func Test_Params_Basic(t *testing.T) {
 func Test_Params_Header(t *testing.T) {
 	s := g.Server(guid.S())
 	s.BindHandler("/header", func(r *ghttp.Request) {
-		r.Response.Write(r.GetHeader("test"))
+		r.Response.Write(map[string]interface{}{
+			"without-def":   r.GetHeader("no-header"),
+			"with-def":      r.GetHeader("no-header", "my-default"),
+			"x-custom-with": r.GetHeader("x-custom", "my-default"),
+		})
 	})
 	s.SetDumpRouterMap(false)
 	s.Start()
@@ -374,8 +378,14 @@ func Test_Params_Header(t *testing.T) {
 		prefix := fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())
 		client := g.Client()
 		client.SetPrefix(prefix)
+		client.SetHeader("x-custom", "custom-value")
 
-		t.Assert(client.Header(g.MapStrStr{"test": "123456"}).GetContent(ctx, "/header"), "123456")
+		resp := client.GetContent(ctx, "/header")
+		t.Assert(gjson.New(resp).Map(), g.Map{
+			"without-def":   "",
+			"with-def":      "my-default",
+			"x-custom-with": "custom-value",
+		})
 	})
 }