fix: do.XXXX struct will not work properly after setting removeFieldPrefix in config.yaml

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_issue_test.go

@@ -316,7 +316,7 @@ func Test_Gen_Dao_Issue3459(t *testing.T) {
 			in      = gendao.CGenDaoInput{
 				Path:               path,
 				Link:               link,
-				Tables:             "",
+				Tables:             "table_user",
 				TablesEx:           "",
 				Group:              group,
 				Prefix:             "",

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -47,7 +47,7 @@ func Test_Gen_Dao_Default(t *testing.T) {
 			in    = gendao.CGenDaoInput{
 				Path:               path,
 				Link:               link,
-				Tables:             "",
+				Tables:             "table_user",
 				TablesEx:           "",
 				Group:              group,
 				Prefix:             "",
@@ -139,7 +139,7 @@ func Test_Gen_Dao_TypeMapping(t *testing.T) {
 			in    = gendao.CGenDaoInput{
 				Path:               path,
 				Link:               link,
-				Tables:             "",
+				Tables:             "table_user",
 				TablesEx:           "",
 				Group:              group,
 				Prefix:             "",
@@ -241,7 +241,7 @@ func Test_Gen_Dao_FieldMapping(t *testing.T) {
 			in    = gendao.CGenDaoInput{
 				Path:               path,
 				Link:               link,
-				Tables:             "",
+				Tables:             "table_user",
 				TablesEx:           "",
 				Group:              group,
 				Prefix:             "",

cmd/gf/internal/cmd/gendao/gendao_do.go

@@ -47,12 +47,13 @@ func generateDo(ctx context.Context, in CGenDaoInternalInput) {
 		)
 		// replace all types to interface{}.
 		structDefinition, _ = gregex.ReplaceStringFuncMatch(
-			"([A-Z]\\w*?)\\s+([\\w\\*\\.]+?)\\s+(//)",
+			//"([A-Z]\\w*?)\\s+([\\w\\*\\.]+?)\\s+(//)",
+			"([A-Z]\\w*?)\\s+([\\w\\*\\.]+?)\\s+(`[\\w|:|\"]+?\\s+`)(//)",
 			structDefinition,
 			func(match []string) string {
 				// If the type is already a pointer/slice/map, it does nothing.
 				if !gstr.HasPrefix(match[2], "*") && !gstr.HasPrefix(match[2], "[]") && !gstr.HasPrefix(match[2], "map") {
-					return fmt.Sprintf(`%s interface{} %s`, match[1], match[3])
+					return fmt.Sprintf(`%s interface{} %s %s`, match[1], match[3], match[4])
 				}
 				return match[0]
 			},

cmd/gf/internal/cmd/gendao/gendao_structure.go

@@ -71,7 +71,7 @@ func generateStructFieldDefinition(
 		err              error
 		localTypeName    gdb.LocalType
 		localTypeNameStr string
-		jsonTag          = gstr.CaseConvert(field.Name, gstr.CaseTypeMatch(in.JsonCase))
+		jsonTag          = gstr.CaseConvert(strings.TrimPrefix(field.Name, in.RemoveFieldPrefix), gstr.CaseTypeMatch(in.JsonCase))
 	)
 
 	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
@@ -145,10 +145,10 @@ func generateStructFieldDefinition(
 	}
 	attrLines = append(attrLines, fmt.Sprintf(` #%sjson:"%s"`, tagKey, jsonTag))
 	// orm tag
-	if !in.IsDo {
-		// entity
-		attrLines = append(attrLines, fmt.Sprintf(` #orm:"%s"`, field.Name))
-	}
+	//if !in.IsDo {
+	// entity
+	attrLines = append(attrLines, fmt.Sprintf(` #orm:"%s"`, field.Name))
+	//}
 	attrLines = append(attrLines, fmt.Sprintf(` #description:"%s"%s`, descriptionTag, tagKey))
 	attrLines = append(attrLines, fmt.Sprintf(` #// %s`, formatComment(field.Comment)))
 

cmd/gf/internal/cmd/testdata/issue/2572/sql1.sql

@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS `user1`;
 CREATE TABLE `user1` (
     `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
     `passport` varchar(45) NOT NULL COMMENT 'User Passport',

cmd/gf/internal/cmd/testdata/issue/2572/sql2.sql

@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS `user2`;
 CREATE TABLE `user2` (
     `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
     `passport` varchar(45) NOT NULL COMMENT 'User Passport',