From 37cb00d78985758e813b6d33cf4ce2406f332da9 Mon Sep 17 00:00:00 2001 From: taobig Date: Thu, 9 Mar 2023 21:34:58 +0800 Subject: [PATCH] Export cache.Option param to NewXXXModel() (#2995) --- tools/goctl/model/sql/template/tpl/model-new.tpl | 4 ++-- tools/goctl/model/sql/template/tpl/model.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/goctl/model/sql/template/tpl/model-new.tpl b/tools/goctl/model/sql/template/tpl/model-new.tpl index c73ab593..76598ecd 100644 --- a/tools/goctl/model/sql/template/tpl/model-new.tpl +++ b/tools/goctl/model/sql/template/tpl/model-new.tpl @@ -1,6 +1,6 @@ -func new{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf{{end}}) *default{{.upperStartCamelObject}}Model { +func new{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf, opts ...cache.Option{{end}}) *default{{.upperStartCamelObject}}Model { return &default{{.upperStartCamelObject}}Model{ - {{if .withCache}}CachedConn: sqlc.NewConn(conn, c){{else}}conn:conn{{end}}, + {{if .withCache}}CachedConn: sqlc.NewConn(conn, c, opts...){{else}}conn:conn{{end}}, table: {{.table}}, } } diff --git a/tools/goctl/model/sql/template/tpl/model.tpl b/tools/goctl/model/sql/template/tpl/model.tpl index 2ca914a4..3b1b1013 100644 --- a/tools/goctl/model/sql/template/tpl/model.tpl +++ b/tools/goctl/model/sql/template/tpl/model.tpl @@ -23,8 +23,8 @@ type ( ) // New{{.upperStartCamelObject}}Model returns a model for the database table. -func New{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf{{end}}) {{.upperStartCamelObject}}Model { +func New{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf, opts ...cache.Option{{end}}) {{.upperStartCamelObject}}Model { return &custom{{.upperStartCamelObject}}Model{ - default{{.upperStartCamelObject}}Model: new{{.upperStartCamelObject}}Model(conn{{if .withCache}}, c{{end}}), + default{{.upperStartCamelObject}}Model: new{{.upperStartCamelObject}}Model(conn{{if .withCache}}, c, opts...{{end}}), } }