fix(cmd/gf): fix gen sharding dao in multiple shardingPattern tables …

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_sharding_test.go

@@ -26,25 +26,33 @@ func Test_Gen_Dao_Sharding(t *testing.T) {
 			tableSingle = "single_table"
 			table1      = "users_0001"
 			table2      = "users_0002"
-			table3      = "users_0003"
+			table3      = "orders_0001"
+			table4      = "orders_0002"
 			sqlFilePath = gtest.DataPath(`gendao`, `sharding`, `sharding.sql`)
 		)
+		dropTableWithDb(db, tableSingle)
+		dropTableWithDb(db, table1)
+		dropTableWithDb(db, table2)
+		dropTableWithDb(db, table3)
+		dropTableWithDb(db, table4)
 		t.AssertNil(execSqlFile(db, sqlFilePath))
 		defer dropTableWithDb(db, tableSingle)
 		defer dropTableWithDb(db, table1)
 		defer dropTableWithDb(db, table2)
 		defer dropTableWithDb(db, table3)
+		defer dropTableWithDb(db, table4)
 
 		var (
 			path = gfile.Temp(guid.S())
-			//path  = "/Users/john/Temp/gen_dao_sharding"
+			// path  = "/Users/john/Temp/gen_dao_sharding"
 			group = "test"
 			in    = gendao.CGenDaoInput{
 				Path:  path,
 				Link:  link,
 				Group: group,
 				ShardingPattern: []string{
 					`users_?`,
+					`orders_?`,
 				},
 			}
 		)
@@ -65,13 +73,16 @@ func Test_Gen_Dao_Sharding(t *testing.T) {
 
 		generatedFiles, err := gfile.ScanDir(path, "*.go", true)
 		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 8)
+		t.Assert(len(generatedFiles), 12)
 		var (
 			daoSingleTableContent = gfile.GetContents(gfile.Join(path, "dao", "single_table.go"))
 			daoUsersContent       = gfile.GetContents(gfile.Join(path, "dao", "users.go"))
+			daoOrdersContent      = gfile.GetContents(gfile.Join(path, "dao", "orders.go"))
 		)
 		t.Assert(gstr.Contains(daoSingleTableContent, "SingleTable = singleTableDao{internal.NewSingleTableDao()}"), true)
-		t.Assert(gstr.Contains(daoUsersContent, "Users = usersDao{internal.NewUsersDao(userShardingHandler)}"), true)
+		t.Assert(gstr.Contains(daoUsersContent, "Users = usersDao{internal.NewUsersDao(usersShardingHandler)}"), true)
 		t.Assert(gstr.Contains(daoUsersContent, "m.Sharding(gdb.ShardingConfig{"), true)
+		t.Assert(gstr.Contains(daoOrdersContent, "Orders = ordersDao{internal.NewOrdersDao(ordersShardingHandler)}"), true)
+		t.Assert(gstr.Contains(daoOrdersContent, "m.Sharding(gdb.ShardingConfig{"), true)
 	})
 }

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

@@ -223,10 +223,13 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 			}
 		}
 		newTableName = in.Prefix + newTableName
-		newTableNames[i] = newTableName
+		if tableNames[i] != "" {
+			// If shardingNewTableSet contains newTableName (tableName is empty), it should not be added to tableNames, make it empty and filter later.
+			newTableNames[i] = newTableName
+		}
 	}
 	tableNames = garray.NewStrArrayFrom(tableNames).FilterEmpty().Slice()
-
+	newTableNames = garray.NewStrArrayFrom(newTableNames).FilterEmpty().Slice() // Filter empty table names. make sure that newTableNames and tableNames have the same length.
 	in.genItems.Scale()
 
 	// Dao: index and internal.

cmd/gf/internal/cmd/gendao/gendao_dao.go

@@ -127,6 +127,7 @@ func generateDaoIndex(in generateDaoIndexInput) {
 		tplView.ClearAssigns()
 		tplView.Assigns(gview.Params{
 			tplVarTableSharding:           in.IsSharding,
+			tplVarTableShardingPrefix:     in.NewTableName + "_",
 			tplVarImportPrefix:            in.ImportPrefix,
 			tplVarTableName:               in.TableName,
 			tplVarTableNameCamelCase:      in.TableNameCamelCase,

cmd/gf/internal/cmd/gendao/gendao_tag.go

@@ -97,6 +97,7 @@ generated json tag case for model struct, cases are as follows:
 	tplVarTableNameCamelCase      = `TplTableNameCamelCase`
 	tplVarTableNameCamelLowerCase = `TplTableNameCamelLowerCase`
 	tplVarTableSharding           = `TplTableSharding`
+	tplVarTableShardingPrefix     = `TplTableShardingPrefix`
 	tplVarPackageImports          = `TplPackageImports`
 	tplVarImportPrefix            = `TplImportPrefix`
 	tplVarStructDefine            = `TplStructDefine`

cmd/gf/internal/cmd/testdata/gendao/sharding/sharding.sql

@@ -1,44 +1,54 @@
-CREATE TABLE `single_table` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
-    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
-    `password` varchar(45) NOT NULL COMMENT 'User Password',
-    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
-    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+CREATE TABLE `single_table`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport`  varchar(45) NOT NULL COMMENT 'User Passport',
+    `password`  varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname`  varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score`     decimal(10, 2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
     `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
     `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `users_0001` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
-    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
-    `password` varchar(45) NOT NULL COMMENT 'User Password',
-    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
-    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+CREATE TABLE `users_0001`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport`  varchar(45) NOT NULL COMMENT 'User Passport',
+    `password`  varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname`  varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score`     decimal(10, 2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
     `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
     `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `users_0002` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
-    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
-    `password` varchar(45) NOT NULL COMMENT 'User Password',
-    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
-    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+CREATE TABLE `users_0002`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport`  varchar(45) NOT NULL COMMENT 'User Passport',
+    `password`  varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname`  varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score`     decimal(10, 2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
     `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
     `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `users_0003` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
-    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
-    `password` varchar(45) NOT NULL COMMENT 'User Password',
-    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
-    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+CREATE TABLE `orders_0001`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ORDER ID',
+    `amount`    decimal(10, 2) unsigned DEFAULT NULL COMMENT 'Total amount.',
+    `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
+    `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `orders_0002`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ORDER ID',
+    `amount`    decimal(10, 2) unsigned DEFAULT NULL COMMENT 'Total amount.',
     `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
     `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
     PRIMARY KEY (`id`)

cmd/gf/internal/consts/consts_gen_dao_template_dao.go

@@ -27,21 +27,21 @@ var (
     // {{.TplTableNameCamelCase}} is a globally accessible object for table {{.TplTableName}} operations.
 	{{.TplTableNameCamelCase}} = {{.TplTableNameCamelLowerCase}}Dao{
 {{- if .TplTableSharding -}}
-    internal.New{{.TplTableNameCamelCase}}Dao(userShardingHandler),
+    internal.New{{.TplTableNameCamelCase}}Dao({{.TplTableNameCamelLowerCase}}ShardingHandler),
 {{- else -}}
     internal.New{{.TplTableNameCamelCase}}Dao(),
 {{- end -}}
 	}
 )
 
 {{if .TplTableSharding -}}
-// userShardingHandler is the handler for sharding operations.
+// {{.TplTableNameCamelLowerCase}}ShardingHandler is the handler for sharding operations.
 // You can fill this sharding handler with your custom implementation.
-func userShardingHandler(m *gdb.Model) *gdb.Model {
+func {{.TplTableNameCamelLowerCase}}ShardingHandler(m *gdb.Model) *gdb.Model {
 	m = m.Sharding(gdb.ShardingConfig{
 		Table:  gdb.ShardingTableConfig{
 			Enable: true,
-			Prefix: "",
+			Prefix: "{{.TplTableShardingPrefix}}",
 			// Replace Rule field with your custom sharding rule.
 			// Or you can use "&gdb.DefaultShardingRule{}" for default sharding rule.
 			Rule: nil,