bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-03 20:01:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
John Guo
2025-12-04 20:41:28 +08:00
parent 8723999afc baf30a0e99
commit ffe65d9d4a
35 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/config/apollo/go.mod
View File

@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/apolloconfig/agollo/v4 v4.3.1
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
)
require (

2
contrib/config/consul/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/hashicorp/consul/api v1.24.0
github.com/hashicorp/go-cleanhttp v0.5.2
)

2
contrib/config/kubecm/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
go 1.24.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
k8s.io/api v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4

2
contrib/config/nacos/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
)

2
contrib/config/polaris/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/polarismesh/polaris-go v1.6.1
)

2
contrib/drivers/clickhouse/go.mod
View File

@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/ClickHouse/clickhouse-go/v2 v2.0.15
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/google/uuid v1.6.0
github.com/shopspring/decimal v1.3.1
)

7
contrib/drivers/dm/dm_do_insert.go
View File

@ -155,7 +155,7 @@ func (d *Driver) doMergeInsert(
return batchResult, nil
}
// getPrimaryKeys retrieves the primary key field list of the table.
// getPrimaryKeys retrieves the primary key field names of the table as a slice of strings.
// This method extracts primary key information from TableFields.
func (d *Driver) getPrimaryKeys(ctx context.Context, table string) ([]string, error) {
tableFields, err := d.TableFields(ctx, table)
@ -206,8 +206,7 @@ func parseSqlForMerge(table string,
pattern, table, queryHolderStr, duplicateKeyStr, insertKeyStr, insertValueStr,
strings.Join(updateValues, ","),
)
} else {
// Insert Ignore: INSERT only
return fmt.Sprintf(pattern, table, queryHolderStr, duplicateKeyStr, insertKeyStr, insertValueStr)
}
// Insert Ignore: INSERT only
return fmt.Sprintf(pattern, table, queryHolderStr, duplicateKeyStr, insertKeyStr, insertValueStr)
}

2
contrib/drivers/dm/dm_z_unit_basic_test.go
View File

@ -561,7 +561,7 @@ func TestModelSave(t *testing.T) {
}
func TestModelInsert(t *testing.T) {
// g.Model.insert not lost default not null coloumn
// g.Model.insert not lost default not null column
table := "A_tables"
createInitTable(table)
gtest.C(t, func(t *gtest.T) {

2
contrib/drivers/dm/go.mod
View File

@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../
require (
gitee.com/chunanyong/dm v1.8.12
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
)
require (

2
contrib/drivers/mssql/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/microsoft/go-mssqldb v1.7.1
)

2
contrib/drivers/mysql/go.mod
View File

@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/go-sql-driver/mysql v1.7.1
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
)
require (

2
contrib/drivers/oracle/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/sijms/go-ora/v2 v2.7.10
)

2
contrib/drivers/pgsql/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/lib/pq v1.10.9
)

2
contrib/drivers/sqlite/go.mod
View File

@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/glebarez/go-sqlite v1.21.2
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
)
require (

2
contrib/drivers/sqlitecgo/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/mattn/go-sqlite3 v1.14.17
)

2
contrib/metric/otelmetric/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/prometheus/client_golang v1.23.2
go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0
go.opentelemetry.io/otel v1.38.0

2
contrib/nosql/redis/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/redis/go-redis/v9 v9.12.1
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/trace v1.38.0

2
contrib/registry/consul/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/consul/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/hashicorp/consul/api v1.26.1
)

2
contrib/registry/etcd/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
go.etcd.io/etcd/client/v3 v3.5.17
google.golang.org/grpc v1.59.0
)

2
contrib/registry/file/go.mod
View File

@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2
go 1.23.0
require github.com/gogf/gf/v2 v2.9.5
require github.com/gogf/gf/v2 v2.9.6
require (
github.com/BurntSushi/toml v1.5.0 // indirect

2
contrib/registry/nacos/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
)

2
contrib/registry/polaris/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
github.com/polarismesh/polaris-go v1.6.1
)

2
contrib/registry/zookeeper/go.mod
View File

@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/go-zookeeper/zk v1.0.3
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
golang.org/x/sync v0.16.0
)

4
contrib/rpc/grpcx/go.mod
View File

@ -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.9.5
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/contrib/registry/file/v2 v2.9.6
github.com/gogf/gf/v2 v2.9.6
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/trace v1.38.0
google.golang.org/grpc v1.64.1

2
contrib/sdk/httpclient/go.mod
View File

@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2
go 1.23.0
require github.com/gogf/gf/v2 v2.9.5
require github.com/gogf/gf/v2 v2.9.6
require (
github.com/BurntSushi/toml v1.5.0 // indirect

2
contrib/trace/otlpgrpc/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
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

2
contrib/trace/otlphttp/go.mod
View File

@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2
go 1.23.0
require (
github.com/gogf/gf/v2 v2.9.5
github.com/gogf/gf/v2 v2.9.6
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