improve test unit

remove useless code
2026-06-08 02:27:42 +08:00 · 2026-05-18 20:36:32 +00:00 · 2026-05-17 11:22:18 +08:00 · 2026-05-17 10:29:34 +08:00 · 2026-05-17 02:25:04 +00:00 · 2026-05-17 10:24:35 +08:00
53 changed files with 191 additions and 281 deletions
--- a/1
+++ b/1
@ -34,6 +34,7 @@ branch:
 version:
 	@set -e; \
 	newVersion=$(to); \
+	$(MAKE) -C cmd/gf pack; \
 	./.make_version.sh ./ $$newVersion; \
 	echo "make version to=$(to) done"

--- a/README.MD
+++ b/README.MD
@ -46,7 +46,7 @@ go get -u github.com/gogf/gf/v2
 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖

 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.10.0" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.10.2" alt="goframe contributors"/>
 </a>

 ## License
--- a/README.zh_CN.MD
+++ b/README.zh_CN.MD
@ -46,7 +46,7 @@ go get -u github.com/gogf/gf/v2
 💖 [感谢所有使 GoFrame 成为可能的贡献者](https://github.com/gogf/gf/graphs/contributors) 💖

 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.10.0" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.10.2" alt="goframe contributors"/>
 </a>

 ## 许可证
--- a/cmd/gf/Makefile
+++ b/cmd/gf/Makefile
@ -18,9 +18,6 @@ pack.template-mono:
 	@cd temp && gf pack template-mono ../internal/packed/template-mono.go -n=packed -y
 	@rm -fr temp

-# Note:
-# command `sed` only works on MacOS.
-# use `grep -irl 'template-single' temp| xargs sed -i'' -e 's/template-single/template-mono-app/g'` on other platforms.
 pack.template-mono-app:
 	@rm -fr temp
 	@mkdir temp || exit 0
@ -31,6 +28,6 @@ pack.template-mono-app:
 	@rm -fr temp/template-mono-app/.gitignore
 	@rm -fr temp/template-mono-app/go.mod
 	@rm -fr temp/template-mono-app/go.sum
-	@grep -irl 'template-single' temp| xargs sed -i '' -e 's/template-single/template-mono-app/g'
+	@grep -irl 'template-single' temp| xargs perl -pi -e 's/template-single/template-mono-app/g'
 	@cd temp && gf pack template-mono-app ../internal/packed/template-mono-app.go -n=packed -y
 	@rm -fr temp
--- a/cmd/gf/go.mod
+++ b/cmd/gf/go.mod
@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v1.1.0
 	github.com/schollz/progressbar/v3 v3.15.0
--- a/cmd/gf/go.sum
+++ b/cmd/gf/go.sum
@ -46,20 +46,20 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0 h1:9PTchr92xIJej4tq5c+HOHSU7LGOHr3YfD7tuf23LW4=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0/go.mod h1:eKtLMs9uccxFvmoKOUCRQ/Se3nxhzEZwF0Ir13qbk5g=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0 h1:mBs6XpNM34IdZPZv4Kv3LA8yhP2UisbONMLfnQVFvKM=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0/go.mod h1:mChbF9FrmiYMSE2rG3zdxI/oSTwaHsR5KbINAgt3KcY=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0 h1:UvqxwinkelKxwdwnKUfdy51/ls4RL7MCeJqAZOVAy0I=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0/go.mod h1:6v7oGBF9wv59WERJIOJxXmLhkUcxwON3tPYW3AZ7wbY=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0 h1:MvhoMaz8YYj4WJuYzKGDdzJYiieiYiqp0vjoOshfOF4=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0/go.mod h1:vb2fx33RGhjhOaocOTEFvlEuBSGHss5S0lZ4sS3XK6E=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 h1:39+jbTenm7KBj4hO2C8ANAxVHpX/7OuRDs1VcGC9ylA=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0/go.mod h1:B0s0fVzn0W220E8UTpSGzrrGKsop5KcB90twBeLCiz0=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0 h1:OyAH7Ls2c9Un7CJiAq7G6eY1jWIICRkN8C5SyM94rnY=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0/go.mod h1:fwhAMG0qZpeHbbP2JE78rJRfV7eBbu9jXkxTMM1lwyo=
-github.com/gogf/gf/v2 v2.10.0 h1:rzDROlyqGMe/eM6dCalSR8dZOuMIdLhmxKSH1DGhbFs=
-github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2 h1:K9MuyxpkwbQFRypXZnqZm06l0N2p3urM8PEqH45IYXo=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2/go.mod h1:Pr/klQ7g0l0qx/MtnFqu9sgeMfVul8ntj/kvGuopJcM=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2 h1:7V+23ohcOWvT4Fgf/79uEs51VLfESbhgntkdLL9IPyA=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2/go.mod h1:8mQd1INT1l7c8gYnUdfqlbDdTyq9ZqjkdvlLFdPD6RE=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2 h1:UdUV+7GhwYLpkwz7VrwIVO/1ZYodyzSL5is25NET24A=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2/go.mod h1:eKc+0i3Il7efS2BBjmpy7T9wvN9NGRd67ZV94r9behA=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2 h1:1ufTnX0yqYvfY0h8cMTfcwKnmkfPl/ClJNsbHEboJhc=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2/go.mod h1:gHYoaDSZA2DeZ7e/n6YcplP3fXAjDvijDFz0WijHASU=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2 h1:u8EpP24GkprogROnJ7htMov9Fc66pTP1eVYrWxiCYOs=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2/go.mod h1:GmvM3r8GVByVMi4RD2+MCs5+CfxVXPMeT8mVDkAaAXE=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2 h1:KLS68SWS2W749x7e+eCCOO3UD2Sbw+bIbLEPR8o1FXw=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2/go.mod h1:uLcsu73PfpyhRc0Jq0gGAWQjN1tyGU9iBRrYgt/lu7g=
+github.com/gogf/gf/v2 v2.10.2 h1:46IO0Uc8e85/FqdftJFskfDejJLBL0JBnGS5qOftUu8=
+github.com/gogf/gf/v2 v2.10.2/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
--- a/cmd/gf/internal/cmd/cmd_init.go
+++ b/cmd/gf/internal/cmd/cmd_init.go
@ -232,14 +232,17 @@ func (c cInit) initFromBuiltin(ctx context.Context, in cInitInput) (out *cInitOu
 				return content
 			}
 		}
+		mlog.Debugf("replace %s %s to %s", path, cInitRepoPrefix+templateRepoName, in.Module)
 		return gstr.Replace(gfile.GetContents(path), cInitRepoPrefix+templateRepoName, in.Module)
 	}, in.Name, "*", true)
 	if err != nil {
 		return
 	}

-	// Format the generated Go files.
-	utils.GoFmt(in.Name)
+	// Format the generated Go files using go/format (not goimports).
+	// utils.GoFmt uses imports.Process which may remove local import paths that cannot
+	// be resolved in the GOPATH or module cache right after generation (e.g. "myapp/api/hello/v1").
+	geninit.FormatGoFiles(in.Name)

 	// Update the GoFrame version.
 	if in.Update {
--- a/cmd/gf/internal/cmd/geninit/geninit_generator.go
+++ b/cmd/gf/internal/cmd/geninit/geninit_generator.go
@ -85,7 +85,7 @@ func generateProject(ctx context.Context, srcPath, name, oldModule, newModule st
 	// 6. Format the generated Go files using go/format (not imports.Process)
 	// Note: We use formatGoFiles instead of utils.GoFmt because imports.Process
 	// may incorrectly "fix" local import paths by replacing them with cached module paths.
-	formatGoFiles(dstPath)
+	FormatGoFiles(dstPath)

 	mlog.Print("Project generated successfully!")
 	return nil
@ -115,10 +115,10 @@ func upgradeDependencies(ctx context.Context, projectDir string) error {
 	return nil
 }

-// formatGoFiles formats all Go files in the directory using go/format.
+// FormatGoFiles formats all Go files in the directory using go/format.
 // Unlike imports.Process, this only formats code without modifying imports,
 // which prevents incorrect "fixing" of local import paths.
-func formatGoFiles(dir string) {
+func FormatGoFiles(dir string) {
 	files, err := findGoFiles(dir)
 	if err != nil {
 		mlog.Printf("Failed to find Go files for formatting: %v", err)
--- a/cmd/gf/internal/cmd/testdata/build/varmap/go.mod
+++ b/cmd/gf/internal/cmd/testdata/build/varmap/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 toolchain go1.24.6

-require github.com/gogf/gf/v2 v2.10.0
+require github.com/gogf/gf/v2 v2.10.2

 require (
 	go.opentelemetry.io/otel v1.38.0 // indirect
--- a/cmd/gf/internal/packed/template-mono-app.go
+++ b/cmd/gf/internal/packed/template-mono-app.go
--- a/cmd/gf/internal/packed/template-mono.go
+++ b/cmd/gf/internal/packed/template-mono.go
--- a/cmd/gf/internal/packed/template-single.go
+++ b/cmd/gf/internal/packed/template-single.go
--- a/contrib/config/apollo/go.mod
+++ b/contrib/config/apollo/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	github.com/apolloconfig/agollo/v4 v4.3.1
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/config/consul/go.mod
+++ b/contrib/config/consul/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/hashicorp/consul/api v1.24.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 )
--- a/contrib/config/kubecm/go.mod
+++ b/contrib/config/kubecm/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
 go 1.24.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	k8s.io/api v0.33.4
 	k8s.io/apimachinery v0.33.4
 	k8s.io/client-go v0.33.4
--- a/contrib/config/nacos/go.mod
+++ b/contrib/config/nacos/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
 )

--- a/contrib/config/polaris/go.mod
+++ b/contrib/config/polaris/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/polarismesh/polaris-go v1.6.1
 )

--- a/contrib/drivers/clickhouse/go.mod
+++ b/contrib/drivers/clickhouse/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/google/uuid v1.6.0
 	github.com/shopspring/decimal v1.3.1
 )
--- a/contrib/drivers/dm/go.mod
+++ b/contrib/drivers/dm/go.mod
@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../

 require (
 	gitee.com/chunanyong/dm v1.8.12
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/drivers/gaussdb/go.mod
+++ b/contrib/drivers/gaussdb/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	gitee.com/opengauss/openGauss-connector-go-pq v1.0.7
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/google/uuid v1.6.0
 )

--- a/contrib/drivers/mariadb/go.mod
+++ b/contrib/drivers/mariadb/go.mod
@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/mariadb/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/drivers/mssql/go.mod
+++ b/contrib/drivers/mssql/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/microsoft/go-mssqldb v1.7.1
 )

--- a/contrib/drivers/mysql/go.mod
+++ b/contrib/drivers/mysql/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	github.com/go-sql-driver/mysql v1.7.1
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/drivers/oceanbase/go.mod
+++ b/contrib/drivers/oceanbase/go.mod
@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/oceanbase/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/drivers/oracle/go.mod
+++ b/contrib/drivers/oracle/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/sijms/go-ora/v2 v2.7.10
 )

--- a/contrib/drivers/pgsql/go.mod
+++ b/contrib/drivers/pgsql/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/google/uuid v1.6.0
 	github.com/lib/pq v1.10.9
 )
--- a/contrib/drivers/sqlite/go.mod
+++ b/contrib/drivers/sqlite/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	github.com/glebarez/go-sqlite v1.21.2
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/drivers/sqlite/sqlite_do_insert.go
+++ b/contrib/drivers/sqlite/sqlite_do_insert.go
@ -1,68 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-// This file implements SQLite insert behavior overrides for upsert conflict inference.
-
-package sqlite
-
-import (
-	"context"
-	"database/sql"
-	"strings"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-)
-
-// DoInsert inserts or updates data for given table.
-func (d *Driver) DoInsert(
-	ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
-) (result sql.Result, err error) {
-	if option.InsertOption == gdb.InsertOptionSave && len(option.OnConflict) == 0 {
-		primaryKeys, err := d.Core.GetPrimaryKeys(ctx, table)
-		if err != nil {
-			return nil, gerror.WrapCode(
-				gcode.CodeInternalError,
-				err,
-				`failed to get primary keys for Save operation`,
-			)
-		}
-		if !saveDataHasPrimaryKeys(list, primaryKeys) {
-			return nil, gerror.NewCodef(
-				gcode.CodeMissingParameter,
-				`Save operation requires conflict detection: `+
-					`either specify OnConflict() columns or ensure table '%s' has primary keys in the data`,
-				table,
-			)
-		}
-		option.OnConflict = primaryKeys
-	}
-	return d.Core.DoInsert(ctx, link, table, list, option)
-}
-
-// saveDataHasPrimaryKeys reports whether the first save record contains all primary keys.
-func saveDataHasPrimaryKeys(list gdb.List, primaryKeys []string) bool {
-	if len(list) == 0 || len(primaryKeys) == 0 {
-		return false
-	}
-	for _, primaryKey := range primaryKeys {
-		if !saveDataHasKey(list[0], primaryKey) {
-			return false
-		}
-	}
-	return true
-}
-
-// saveDataHasKey reports whether the save data contains the given key case-insensitively.
-func saveDataHasKey(data gdb.Map, key string) bool {
-	for dataKey := range data {
-		if strings.EqualFold(dataKey, key) {
-			return true
-		}
-	}
-	return false
-}
--- a/contrib/drivers/sqlite/sqlite_z_unit_core_test.go
+++ b/contrib/drivers/sqlite/sqlite_z_unit_core_test.go
@ -439,26 +439,8 @@ func Test_DB_Save(t *testing.T) {
 			"nickname":    fmt.Sprintf(`T%d`, i),
 			"create_time": gtime.Now().String(),
 		}
-		result, err := db.Save(ctx, "t_user", data, 10)
-		t.AssertNil(err)
-		rowsAffected, err := result.RowsAffected()
-		t.AssertNil(err)
-		t.Assert(rowsAffected, 1)
-
-		data["nickname"] = "T10-updated"
-		result, err = db.Save(ctx, "t_user", data, 10)
-		t.AssertNil(err)
-		rowsAffected, err = result.RowsAffected()
-		t.AssertNil(err)
-		t.Assert(rowsAffected, 1)
-
-		value, err := db.Model("t_user").Where("id", i).Value("nickname")
-		t.AssertNil(err)
-		t.Assert(value.String(), "T10-updated")
-
-		delete(data, "id")
-		_, err = db.Save(ctx, "t_user", data, 10)
-		t.AssertNE(err, nil)
+		_, err := db.Save(ctx, "t_user", data, 10)
+		gtest.AssertNE(err, nil)
 	})
 }

--- a/contrib/drivers/sqlitecgo/go.mod
+++ b/contrib/drivers/sqlitecgo/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/mattn/go-sqlite3 v1.14.17
 )

--- a/contrib/drivers/sqlitecgo/sqlitecgo_do_insert.go
+++ b/contrib/drivers/sqlitecgo/sqlitecgo_do_insert.go
@ -1,68 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-// This file implements SQLiteCGO insert behavior overrides for upsert conflict inference.
-
-package sqlitecgo
-
-import (
-	"context"
-	"database/sql"
-	"strings"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-)
-
-// DoInsert inserts or updates data for given table.
-func (d *Driver) DoInsert(
-	ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
-) (result sql.Result, err error) {
-	if option.InsertOption == gdb.InsertOptionSave && len(option.OnConflict) == 0 {
-		primaryKeys, err := d.Core.GetPrimaryKeys(ctx, table)
-		if err != nil {
-			return nil, gerror.WrapCode(
-				gcode.CodeInternalError,
-				err,
-				`failed to get primary keys for Save operation`,
-			)
-		}
-		if !saveDataHasPrimaryKeys(list, primaryKeys) {
-			return nil, gerror.NewCodef(
-				gcode.CodeMissingParameter,
-				`Save operation requires conflict detection: `+
-					`either specify OnConflict() columns or ensure table '%s' has primary keys in the data`,
-				table,
-			)
-		}
-		option.OnConflict = primaryKeys
-	}
-	return d.Core.DoInsert(ctx, link, table, list, option)
-}
-
-// saveDataHasPrimaryKeys reports whether the first save record contains all primary keys.
-func saveDataHasPrimaryKeys(list gdb.List, primaryKeys []string) bool {
-	if len(list) == 0 || len(primaryKeys) == 0 {
-		return false
-	}
-	for _, primaryKey := range primaryKeys {
-		if !saveDataHasKey(list[0], primaryKey) {
-			return false
-		}
-	}
-	return true
-}
-
-// saveDataHasKey reports whether the save data contains the given key case-insensitively.
-func saveDataHasKey(data gdb.Map, key string) bool {
-	for dataKey := range data {
-		if strings.EqualFold(dataKey, key) {
-			return true
-		}
-	}
-	return false
-}
--- a/contrib/drivers/sqlitecgo/sqlitecgo_z_unit_core_test.go
+++ b/contrib/drivers/sqlitecgo/sqlitecgo_z_unit_core_test.go
@ -439,26 +439,8 @@ func Test_DB_Save(t *testing.T) {
 			"nickname":    fmt.Sprintf(`T%d`, i),
 			"create_time": gtime.Now().String(),
 		}
-		result, err := db.Save(ctx, "t_user", data, 10)
-		t.AssertNil(err)
-		rowsAffected, err := result.RowsAffected()
-		t.AssertNil(err)
-		t.Assert(rowsAffected, 1)
-
-		data["nickname"] = "T10-updated"
-		result, err = db.Save(ctx, "t_user", data, 10)
-		t.AssertNil(err)
-		rowsAffected, err = result.RowsAffected()
-		t.AssertNil(err)
-		t.Assert(rowsAffected, 1)
-
-		value, err := db.Model("t_user").Where("id", i).Value("nickname")
-		t.AssertNil(err)
-		t.Assert(value.String(), "T10-updated")
-
-		delete(data, "id")
-		_, err = db.Save(ctx, "t_user", data, 10)
-		t.AssertNE(err, nil)
+		_, err := db.Save(ctx, "t_user", data, 10)
+		gtest.AssertNE(err, nil)
 	})
 }

--- a/contrib/drivers/tidb/go.mod
+++ b/contrib/drivers/tidb/go.mod
@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/tidb/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
--- a/contrib/metric/otelmetric/go.mod
+++ b/contrib/metric/otelmetric/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/prometheus/client_golang v1.23.2
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0
 	go.opentelemetry.io/otel v1.38.0
--- a/contrib/nosql/redis/go.mod
+++ b/contrib/nosql/redis/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/redis/go-redis/v9 v9.12.1
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/trace v1.38.0
--- a/contrib/registry/consul/go.mod
+++ b/contrib/registry/consul/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/consul/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/hashicorp/consul/api v1.26.1
 )

--- a/contrib/registry/etcd/go.mod
+++ b/contrib/registry/etcd/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	go.etcd.io/etcd/client/v3 v3.5.17
 	google.golang.org/grpc v1.59.0
 )
--- a/contrib/registry/file/go.mod
+++ b/contrib/registry/file/go.mod
@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2

 go 1.23.0

-require github.com/gogf/gf/v2 v2.10.0
+require github.com/gogf/gf/v2 v2.10.2

 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
--- a/contrib/registry/nacos/go.mod
+++ b/contrib/registry/nacos/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/nacos-group/nacos-sdk-go/v2 v2.3.5
 )

--- a/contrib/registry/polaris/go.mod
+++ b/contrib/registry/polaris/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	github.com/polarismesh/polaris-go v1.6.1
 )

--- a/contrib/registry/zookeeper/go.mod
+++ b/contrib/registry/zookeeper/go.mod
@ -4,7 +4,7 @@ go 1.23.0

 require (
 	github.com/go-zookeeper/zk v1.0.3
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	golang.org/x/sync v0.16.0
 )

--- a/contrib/rpc/grpcx/go.mod
+++ b/contrib/rpc/grpcx/go.mod
@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/contrib/registry/file/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/contrib/registry/file/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/trace v1.38.0
 	google.golang.org/grpc v1.64.1
--- a/contrib/sdk/httpclient/go.mod
+++ b/contrib/sdk/httpclient/go.mod
@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2

 go 1.23.0

-require github.com/gogf/gf/v2 v2.10.0
+require github.com/gogf/gf/v2 v2.10.2

 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
--- a/contrib/trace/otlpgrpc/go.mod
+++ b/contrib/trace/otlpgrpc/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
--- a/contrib/trace/otlphttp/go.mod
+++ b/contrib/trace/otlphttp/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2
 go 1.23.0

 require (
-	github.com/gogf/gf/v2 v2.10.0
+	github.com/gogf/gf/v2 v2.10.2
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
--- a/openspec/changes/sqlite-save-primary-conflict/.openspec.yaml
+++ b/openspec/changes/sqlite-save-primary-conflict/.openspec.yaml
@ -1,2 +0,0 @@
-schema: spec-driven
-created: 2026-05-08
--- a/openspec/changes/sqlite-save-primary-conflict/design.md
+++ b/openspec/changes/sqlite-save-primary-conflict/design.md
@ -1,5 +0,0 @@
-# Design
-
-The SQLite drivers will prepare `Save` insert options before delegating to the shared `gdb.Core.DoInsert` implementation. When `InsertOptionSave` is used without explicit conflict columns, each driver reads the table primary keys through `Core.GetPrimaryKeys`, verifies that the first save record includes those primary key fields, and sets `DoInsertOption.OnConflict` accordingly. Existing explicit `OnConflict(...)` behavior remains unchanged.
-
-If no usable primary key can be found in the save data, the drivers will return a missing-parameter error with guidance to specify `OnConflict(...)` or include primary key values.
--- a/openspec/changes/sqlite-save-primary-conflict/proposal.md
+++ b/openspec/changes/sqlite-save-primary-conflict/proposal.md
@ -1,3 +0,0 @@
-# SQLite Save Primary Conflict
-
-SQLite `Save` currently requires callers to specify `OnConflict(...)` explicitly, even when the target table has a primary key and the save data includes that primary key. This change aligns the SQLite and SQLiteCGO drivers with other upsert-capable drivers by automatically using table primary keys as the conflict target when `OnConflict(...)` is omitted.
--- a/openspec/changes/sqlite-save-primary-conflict/specs/sqlite-upsert/spec.md
+++ b/openspec/changes/sqlite-save-primary-conflict/specs/sqlite-upsert/spec.md
@ -1,21 +0,0 @@
-# sqlite-upsert Specification
-
-## ADDED Requirements
-
-### Requirement: SQLite Save infers primary-key conflicts
-The SQLite and SQLiteCGO drivers SHALL infer the table primary key columns as the upsert conflict target for `Save` operations when callers do not explicitly provide `OnConflict(...)`.
-
-#### Scenario: Save data includes the primary key
- **WHEN** a caller executes `Save` against a SQLite table without `OnConflict(...)`
- **AND** the table has primary key columns present in the save data
- **THEN** the driver SHALL use those primary key columns as the conflict target
- **AND** the save SHALL insert new rows or update existing rows using SQLite upsert syntax
-
-#### Scenario: Save data has no usable primary key
- **WHEN** a caller executes `Save` against a SQLite table without `OnConflict(...)`
- **AND** the table does not have primary key columns present in the save data
- **THEN** the driver SHALL return a missing-parameter error instructing the caller to specify `OnConflict(...)` or include primary key values
-
-#### Scenario: Explicit conflict columns are provided
- **WHEN** a caller executes `Save` against a SQLite table with `OnConflict(...)`
- **THEN** the driver SHALL use the explicitly provided conflict columns
--- a/openspec/changes/sqlite-save-primary-conflict/tasks.md
+++ b/openspec/changes/sqlite-save-primary-conflict/tasks.md
@ -1,3 +0,0 @@
-## Feedback
-
- [x] **FB-1**: Allow SQLite and SQLiteCGO `Save` to infer primary-key conflict columns when `OnConflict` is omitted
--- a/util/gconv/gconv_z_unit_uuid_test.go
+++ b/util/gconv/gconv_z_unit_uuid_test.go
@ -0,0 +1,115 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gconv_test
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+func init() {
+	err := initConverter()
+	if err != nil {
+		panic(err)
+	}
+}
+
+func TestBsToUUID(t *testing.T) {
+
+	gtest.C(t, func(t *gtest.T) {
+
+		v, _ := uuid.NewV7()
+		b := v[:]
+		var u uuid.UUID
+
+		err := gconv.Scan(v, &u)
+		t.Assert(err, nil)
+		t.Assert(v, u)
+
+		err = gconv.Scan(b, &u)
+		t.Assert(err, nil)
+		t.Assert(v, u)
+
+	})
+}
+
+func TestUUIDToBS(t *testing.T) {
+
+	gtest.C(t, func(t *gtest.T) {
+
+		v, _ := uuid.NewV7()
+
+		var bs []byte
+		err := gconv.Scan(v, &bs)
+
+		t.Assert(err, nil)
+		t.Assert(v[:], bs)
+
+		var u [16]byte
+
+		err = gconv.Scan(v, &u)
+		t.Assert(err, nil)
+		t.Assert([16]byte(v), u)
+	})
+}
+
+func initConverter() (err error) {
+	for _, fn := range []any{
+		convBsToUUID,
+		convStrToUUID,
+		convUUIDToBs,
+		convUUIDToStr,
+		convGvarToUUID,
+		convUUIDToArray,
+	} {
+		if err = gconv.RegisterTypeConverterFunc(fn); err != nil {
+			return
+		}
+	}
+	return
+}
+
+func convGvarToUUID(v gvar.Var) (u *uuid.UUID, err error) {
+	return convBsToUUID(v.Bytes())
+}
+
+func convBsToUUID(bs []byte) (uid *uuid.UUID, err error) {
+	uid = new(uuid.UUID)
+	if len(bs) == 16 {
+		*uid, err = uuid.FromBytes(bs)
+	} else {
+		*uid, err = uuid.ParseBytes(bs)
+	}
+	return
+}
+
+func convUUIDToArray(uid uuid.UUID) (bs *[16]byte, err error) {
+	bs = new([16]byte)
+	*bs = uid
+	return
+}
+
+func convUUIDToBs(uid uuid.UUID) (bs *[]byte, err error) {
+	bs = new([]byte)
+	*bs = uid[:]
+	return
+}
+
+func convUUIDToStr(uid uuid.UUID) (str *string, err error) {
+	str = new(string)
+	*str = uid.String()
+	return
+}
+
+func convStrToUUID(str string) (uid *uuid.UUID, err error) {
+	return convBsToUUID([]byte(str))
+}
--- a/util/gconv/internal/converter/converter_scan.go
+++ b/util/gconv/internal/converter/converter_scan.go
@ -275,7 +275,7 @@ func (c *Converter) doScanForComplicatedTypes(
 			ContinueOnError: option.ContinueOnError,
 		})

-	case reflect.Array, reflect.Slice:
+	case reflect.Slice:
 		var (
 			sliceElem     = dstPointerReflectTypeElem.Elem()
 			sliceElemKind = sliceElem.Kind()
--- a/version.go
+++ b/version.go
@ -2,5 +2,5 @@ package gf

 const (
 	// VERSION is the current GoFrame version.
-	VERSION = "v2.10.0"
+	VERSION = "v2.10.2"
 )
Author	SHA1	Message	Date
github-actions[bot]	4aa84766a3	improve test unit	2026-05-18 20:36:32 +00:00
Hunk Zhu	d654fb723b	improve test unit	2026-05-17 11:22:18 +08:00
Hunk Zhu	0bd1fe29a0	remove useless code	2026-05-17 10:29:34 +08:00
github-actions[bot]	6c6edf0f08	Apply gci import order changes	2026-05-17 02:25:04 +00:00
Hunk Zhu	2c84ffddc3	add test for gconv uuid convert	2026-05-17 10:24:35 +08:00
Hunk Zhu	e7232c92eb	fix a bug which will lead []byte -> uuid.UUID fail	2026-05-17 10:03:18 +08:00
github-actions[bot]	cae8ce3b51	fix: update gf cli to v2.10.2 (#4773 ) Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action Co-authored-by: hailaz <hailaz@users.noreply.github.com>	2026-05-14 16:03:35 +08:00
码到功成	9a91bd203b	fix: v2.10.2 (#4772 ) fixed #4750 fixed #4757 fixed #4767	2026-05-14 16:00:16 +08:00
码到功成	72733e0bad	refactor(cmd/gf): improve code structure for readability and maintainability (#4771 ) Refactor the code structure to enhance readability and maintainability without altering functionality. fixed #4750 #4757 #4767 另外使用`gf init -r github.com/gogf/template-single my-project`方式没有问题合并后v2.10.2生效	2026-05-14 15:34:43 +08:00
github-actions[bot]	d44e082ff5	fix: update gf cli to v2.10.1 (#4770 ) Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action Co-authored-by: gqcn <gqcn@users.noreply.github.com>	2026-05-14 14:31:30 +08:00
John Guo	078c1bc7f9	feat: new version v2.10.1 (#4769 ) This pull request updates the GoFrame framework and its related drivers and configuration modules from version v2.10.0 to v2.10.1 across multiple `go.mod` files and documentation. The main goal is to ensure all dependencies consistently use the latest patch version, improving compatibility and stability. Dependency version updates: * Updated `github.com/gogf/gf/v2` and related driver dependencies from v2.10.0 to v2.10.1 in the following `go.mod` files: - `cmd/gf/go.mod` - `contrib/config/apollo/go.mod` - `contrib/config/consul/go.mod` - `contrib/config/kubecm/go.mod` - `contrib/config/nacos/go.mod` - `contrib/config/polaris/go.mod` - `contrib/drivers/clickhouse/go.mod` - `contrib/drivers/dm/go.mod` - `contrib/drivers/gaussdb/go.mod` - `contrib/drivers/mariadb/go.mod` - `contrib/drivers/mssql/go.mod` - `contrib/drivers/mysql/go.mod` - `contrib/drivers/oceanbase/go.mod` - `contrib/drivers/oracle/go.mod` - `contrib/drivers/pgsql/go.mod` - `contrib/drivers/sqlite/go.mod` - `contrib/drivers/sqlitecgo/go.mod` - `contrib/drivers/tidb/go.mod` Documentation updates: * Updated the contributors badge in `README.MD` and `README.zh_CN.MD` to reflect version v2.10.1. [[1]](diffhunk://#diff-01e6d9ffed056a02cae8d8a0ec5d476a64d017bf85c0d5a94bb23ca21f33f5aaL49-R49) [[2]](diffhunk://#diff-c93759cb9a9500f20e551c741eb167fc72825fd638d36121357feb8253ce6ac1L49-R49)	2026-05-14 13:26:50 +08:00