gogf · fainc · Jul 5, 2025 · Jul 5, 2025
diff --git a/cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go b/cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go
@@ -367,3 +367,76 @@ func Test_Issue_3955(t *testing.T) {
 		}
 	})
 }
+
+func Test_Issue_4330_TypeMapping_Ineffective(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`issue`, `3685`, `user.tpl.sql`),
+				table,
+			)
+		)
+		dropTableWithDb(db, table)
+		array := gstr.SplitAndTrim(sqlContent, ";")
+		for _, v := range array {
+			if _, err = db.Exec(ctx, v); err != nil {
+				t.AssertNil(err)
+			}
+		}
+		defer dropTableWithDb(db, table)
+
+		var (
+			path = gfile.Temp(guid.S())
+			in   = genpbentity.CGenPbEntityInput{
+				Path:              path,
+				Package:           "",
+				Link:              link,
+				Tables:            "",
+				Prefix:            "",
+				RemovePrefix:      "",
+				RemoveFieldPrefix: "",
+				NameCase:          "",
+				JsonCase:          "",
+				Option:            "",
+				TypeMapping: map[genpbentity.DBFieldTypeName]genpbentity.CustomAttributeType{
+					"json": {
+						Type:   "google.protobuf.Value",
+						Import: "google/protobuf/struct.proto",
+					},
+					"decimal": {
+						Type: "double",
+					},
+				},
+				FieldMapping: nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		_, err = genpbentity.CGenPbEntity{}.PbEntity(ctx, in)
+		t.AssertNil(err)
+
+		// files
+		files, err := gfile.ScanDir(path, "*.proto", false)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			path + filepath.FromSlash("/table_user.proto"),
+		})
+
+		// contents
+		testPath := gtest.DataPath("issue", "4330")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/issue4330_double.proto"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
diff --git a/cmd/gf/internal/cmd/genpbentity/genpbentity.go b/cmd/gf/internal/cmd/genpbentity/genpbentity.go
@@ -441,14 +441,23 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 		err              error
 		ctx              = gctx.GetInitCtx()
 	)
-
 	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
+		// match typeMapping after local type transform.
+		// eg: double => string, varchar => string etc.
 		localTypeName, err = in.DB.CheckLocalTypeForField(ctx, field.Type, nil)
 		if err != nil {
 			panic(err)
 		}
 		if localTypeName != "" {
-			if typeMapping, ok := in.TypeMapping[strings.ToLower(string(localTypeName))]; ok {
+			if typeMappingLocal, localOk := in.TypeMapping[strings.ToLower(string(localTypeName))]; localOk {
+				localTypeNameStr = typeMappingLocal.Type
+				appendImport = typeMappingLocal.Import
+			}
+		}
+		// Try match unknown / string localTypeName with db type.
+		if localTypeName == "" || localTypeName == gdb.LocalTypeString {
+			formattedFieldType, _ := in.DB.GetFormattedDBTypeNameForField(field.Type)
+			if typeMapping, ok := in.TypeMapping[strings.ToLower(formattedFieldType)]; ok {
 				localTypeNameStr = typeMapping.Type
 				appendImport = typeMapping.Import
 			}

diff --git a/cmd/gf/internal/cmd/testdata/issue/4330/issue4330_double.proto b/cmd/gf/internal/cmd/testdata/issue/4330/issue4330_double.proto
@@ -0,0 +1,23 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+syntax = "proto3";
+
+package pbentity;
+
+option go_package = "github.com/gogf/gf/cmd/gf/v2/internal/cmd/api/pbentity";
+
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
+
+message TableUser {
+    uint32                    Id       = 1; // User ID
+    string                    Passport = 2; // User Passport
+    string                    Password = 3; // User Password
+    string                    Nickname = 4; // User Nickname
+    double                    Score    = 5; // Total score amount.
+    google.protobuf.Value     Data     = 6; // User Data
+    google.protobuf.Timestamp CreateAt = 7; // Created Time
+    google.protobuf.Timestamp UpdateAt = 8; // Updated Time
+}
diff --git a/cmd/gf/internal/cmd/testdata/issue/4330/issue4330_string.proto b/cmd/gf/internal/cmd/testdata/issue/4330/issue4330_string.proto
@@ -0,0 +1,23 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+syntax = "proto3";
+
+package pbentity;
+
+option go_package = "github.com/gogf/gf/cmd/gf/v2/internal/cmd/api/pbentity";
+
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
+
+message TableUser {
+    uint32                    Id       = 1; // User ID
+    string                    Passport = 2; // User Passport
+    string                    Password = 3; // User Password
+    string                    Nickname = 4; // User Nickname
+    string                    Score    = 5; // Total score amount.
+    google.protobuf.Value     Data     = 6; // User Data
+    google.protobuf.Timestamp CreateAt = 7; // Created Time
+    google.protobuf.Timestamp UpdateAt = 8; // Updated Time
+}
diff --git a/database/gdb/gdb.go b/database/gdb/gdb.go
@@ -328,6 +328,9 @@ type DB interface {
 	// It handles type conversion from database-specific types to Go types.
 	ConvertValueForLocal(ctx context.Context, fieldType string, fieldValue interface{}) (interface{}, error)
 
+	// GetFormattedDBTypeNameForField returns the formatted database type name and pattern for a field type.
+	GetFormattedDBTypeNameForField(fieldType string) (typeName, typePattern string)
+
 	// CheckLocalTypeForField checks if a Go value is compatible with a database field type.
 	// It returns the appropriate LocalType and any conversion errors.
 	CheckLocalTypeForField(ctx context.Context, fieldType string, fieldValue interface{}) (LocalType, error)

diff --git a/database/gdb/gdb_core_structure.go b/database/gdb/gdb_core_structure.go
@@ -222,14 +222,9 @@ Default:
 	return convertedValue, nil
 }
 
-// CheckLocalTypeForField checks and returns corresponding type for given db type.
-// The `fieldType` is retrieved from ColumnTypes of db driver, example:
-// UNSIGNED INT
-func (c *Core) CheckLocalTypeForField(ctx context.Context, fieldType string, _ interface{}) (LocalType, error) {
-	var (
-		typeName    string
-		typePattern string
-	)
+// GetFormattedDBTypeNameForField retrieves and returns the formatted database type name
+// eg. `int(10) unsigned` -> `int`, `varchar(100)` -> `varchar`, etc.
+func (c *Core) GetFormattedDBTypeNameForField(fieldType string) (typeName, typePattern string) {
 	match, _ := gregex.MatchString(`(.+?)\((.+)\)`, fieldType)
 	if len(match) == 3 {
 		typeName = gstr.Trim(match[1])
@@ -242,9 +237,19 @@ func (c *Core) CheckLocalTypeForField(ctx context.Context, fieldType string, _ i
 			typeName = array[0]
 		}
 	}
-
 	typeName = strings.ToLower(typeName)
+	return
+}
 
+// CheckLocalTypeForField checks and returns corresponding type for given db type.
+// The `fieldType` is retrieved from ColumnTypes of db driver, example:
+// UNSIGNED INT
+func (c *Core) CheckLocalTypeForField(ctx context.Context, fieldType string, _ interface{}) (LocalType, error) {
+	var (
+		typeName    string
+		typePattern string
+	)
+	typeName, typePattern = c.GetFormattedDBTypeNameForField(fieldType)
 	switch typeName {
 	case
 		fieldTypeBinary,