Quellcode durchsuchen

fix: template cache key (#121)

Keson vor 4 Jahren
Ursprung
Commit
7d4a548d29

+ 1 - 1
tools/goctl/model/sql/gen/findonebyfield.go

@@ -25,7 +25,6 @@ func genFindOneByField(table Table, withCache bool) (string, string, error) {
 			"withCache":                 withCache,
 			"cacheKey":                  table.CacheKey[field.Name.Source()].KeyExpression,
 			"cacheKeyVariable":          table.CacheKey[field.Name.Source()].Variable,
-			"primaryKeyLeft":            table.CacheKey[table.PrimaryKey.Name.Source()].Left,
 			"lowerStartCamelObject":     stringx.From(camelTableName).UnTitle(),
 			"lowerStartCamelField":      stringx.From(camelFieldName).UnTitle(),
 			"upperStartCamelPrimaryKey": table.PrimaryKey.Name.ToCamel(),
@@ -39,6 +38,7 @@ func genFindOneByField(table Table, withCache bool) (string, string, error) {
 	if withCache {
 		out, err := util.With("findOneByFieldExtraMethod").Parse(template.FindOneByFieldExtraMethod).Execute(map[string]interface{}{
 			"upperStartCamelObject": camelTableName,
+			"primaryKeyLeft":        table.CacheKey[table.PrimaryKey.Name.Source()].Left,
 			"lowerStartCamelObject": stringx.From(camelTableName).UnTitle(),
 			"originalPrimaryField":  table.PrimaryKey.Name.Source(),
 		})

+ 1 - 1
tools/goctl/model/sql/template/find.go

@@ -65,7 +65,7 @@ func (m *{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}({{.in}}) (*{{
 `
 var FindOneByFieldExtraMethod = `
 func (m *{{.upperStartCamelObject}}Model) formatPrimary(primary interface{}) string {
-	return fmt.Sprintf("%s%v", cacheUserIdPrefix, primary)
+	return fmt.Sprintf("%s%v", {{.primaryKeyLeft}}, primary)
 }
 
 func (m *{{.upperStartCamelObject}}Model) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {