chore(template): update .template go-zero/model

Author: dependabot[bot]

.template/go-zero/model/delete.tpl

@@ -1,6 +1,6 @@
 func (m *default{{.upperStartCamelObject}}Model) Delete(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) error {
 	sb := sqlbuilder.DeleteFrom(m.table)
-    sb.Where(sb.EQ("{{.originalPrimaryKey}}", {{.lowerStartCamelPrimaryKey}}))
+    sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), {{.lowerStartCamelPrimaryKey}}))
     statement, args := sb.Build()
     var err error
     if session != nil {
@@ -20,7 +20,7 @@ func (m *default{{.upperStartCamelObject}}Model) DeleteWithCache(ctx context.Con
     {{end}}	{{.keys}}
         _, err {{if .containsIndexCache}}={{else}}:={{end}} m.cachedConn.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
     		sb := sqlbuilder.DeleteFrom(m.table)
-            sb.Where(sb.EQ("{{.originalPrimaryKey}}", {{.lowerStartCamelPrimaryKey}}))
+            sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), {{.lowerStartCamelPrimaryKey}}))
             statement, args := sb.Build()
             if session != nil {
     			return session.ExecCtx(ctx, statement, args...)

.template/go-zero/model/find-one-by-field-extra-method.tpl

@@ -4,7 +4,7 @@ func (m *default{{.upperStartCamelObject}}Model) formatPrimary(primary any) stri
 
 func (m *default{{.upperStartCamelObject}}Model) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error {
     sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
-    sb.Where(sb.EQ("{{.originalPrimaryField}}", primary))
+    sb.Where(sb.EQ(condition.Field("{{.originalPrimaryField}}"), primary))
     sql, args := sb.Build()
 	return conn.QueryRowCtx(ctx, v, sql, args...)
 }

.template/go-zero/model/find-one.tpl

@@ -1,6 +1,6 @@
 func (m *default{{.upperStartCamelObject}}Model) FindOne(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) {
 	sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
-	sb.Where(sb.EQ("{{.originalPrimaryKey}}", {{.lowerStartCamelPrimaryKey}}))
+	sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), {{.lowerStartCamelPrimaryKey}}))
 	sb.Limit(1)
 	sql, args := sb.Build()
 	var resp {{.upperStartCamelObject}}
@@ -25,7 +25,7 @@ func (m *default{{.upperStartCamelObject}}Model) FindOneWithCache(ctx context.Co
 	var resp {{.upperStartCamelObject}}
 	err := m.cachedConn.QueryRowCtx(ctx, &resp, {{.cacheKeyVariable}}, func(ctx context.Context, conn sqlx.SqlConn, v any) error {
 	    sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
-	    sb.Where(sb.EQ("{{.originalPrimaryKey}}", {{.lowerStartCamelPrimaryKey}}))
+	    sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), {{.lowerStartCamelPrimaryKey}}))
         sql, args := sb.Build()
         if session != nil {
 		    return session.QueryRowCtx(ctx, v, sql, args...)

.template/go-zero/model/import-no-cache.tpl

@@ -4,10 +4,8 @@ import (
 	"strings"
 	{{if .time}}"time"{{end}}
 
-	"github.com/zeromicro/go-zero/core/stores/builder"
 	"github.com/zeromicro/go-zero/core/stores/sqlc"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
-	"github.com/zeromicro/go-zero/core/stringx"
 	"github.com/huandu/go-sqlbuilder"
 	"github.com/jzero-io/jzero-contrib/condition"
 	"github.com/jzero-io/jzero-contrib/modelx"

.template/go-zero/model/import.tpl

@@ -5,10 +5,8 @@ import (
 	"strings"
 	{{if .time}}"time"{{end}}
 
-	"github.com/zeromicro/go-zero/core/stores/builder"
 	"github.com/zeromicro/go-zero/core/stores/sqlc"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
-	"github.com/zeromicro/go-zero/core/stringx"
 	"github.com/huandu/go-sqlbuilder"
 	"github.com/jzero-io/jzero-contrib/condition"
 	"github.com/jzero-io/jzero-contrib/modelx"

.template/go-zero/model/model-new.tpl

@@ -7,9 +7,12 @@ func new{{.upperStartCamelObject}}Model(conn sqlx.SqlConn, op ...opts.Opt[modelx
     if o.CachedConn != nil {
     	cachedConn = *o.CachedConn
     }
+
+    initVars()
+
 	return &default{{.upperStartCamelObject}}Model{
 		cachedConn: cachedConn,
 		conn: conn,
-		table:      {{.table}},
+		table:      condition.Table({{.table}}),
 	}
 }

.template/go-zero/model/update.tpl

@@ -6,7 +6,7 @@ func (m *default{{.upperStartCamelObject}}Model) Update(ctx context.Context, ses
         assigns = append(assigns, sb.Assign(s, nil))
     }
     sb.Set(assigns...)
-    sb.Where(sb.EQ("{{.originalPrimaryKey}}", nil))
+    sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), nil))
     statement, _ := sb.Build()
 
     var err error
@@ -32,7 +32,7 @@ func (m *default{{.upperStartCamelObject}}Model) UpdateWithCache(ctx context.Con
            assigns = append(assigns, sb.Assign(s, nil))
         }
         sb.Set(assigns...)
-        sb.Where(sb.EQ("{{.originalPrimaryKey}}", nil))
+        sb.Where(sb.EQ(condition.Field("{{.originalPrimaryKey}}"), nil))
         statement, _ := sb.Build()
         if session != nil{
             return session.ExecCtx(ctx, statement, {{.expressionValues}})

.template/go-zero/model/var.tpl

@@ -1,8 +1,13 @@
 var (
-{{.lowerStartCamelObject}}FieldNames = builder.RawFieldNames(&{{.upperStartCamelObject}}{}{{if .postgreSql}}, true{{end}})
-{{.lowerStartCamelObject}}Rows = strings.Join({{.lowerStartCamelObject}}FieldNames, ",")
-{{.lowerStartCamelObject}}RowsExpectAutoSet = {{if .postgreSql}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, {{if .autoIncrement}}"{{.originalPrimaryKey}}", {{end}} {{.ignoreColumns}}), ","){{else}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, {{if .autoIncrement}}"{{.originalPrimaryKey}}", {{end}} {{.ignoreColumns}}), ","){{end}}
-{{.lowerStartCamelObject}}RowsWithPlaceHolder = {{if .postgreSql}}builder.PostgreSqlJoin(stringx.Remove({{.lowerStartCamelObject}}FieldNames, "{{.originalPrimaryKey}}", {{.ignoreColumns}})){{else}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, "{{.originalPrimaryKey}}", {{.ignoreColumns}}), "=?,") + "=?"{{end}}
+{{.lowerStartCamelObject}}FieldNames []string
+{{.lowerStartCamelObject}}Rows string
+{{.lowerStartCamelObject}}RowsExpectAutoSet string
 
 {{if .withCache}}{{.cacheKeys}}{{end}}
 )
+
+func initVars() {
+        {{.lowerStartCamelObject}}FieldNames = condition.RawFieldNames(&{{.upperStartCamelObject}}{})
+        {{.lowerStartCamelObject}}Rows = strings.Join({{.lowerStartCamelObject}}FieldNames, ",")
+        {{.lowerStartCamelObject}}RowsExpectAutoSet = strings.Join(condition.RemoveIgnoreColumns({{.lowerStartCamelObject}}FieldNames, {{if .autoIncrement}}"{{.originalPrimaryKey}}", {{end}} {{.ignoreColumns}}), ",")
+}