mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
125 lines
4.1 KiB
Go
125 lines
4.1 KiB
Go
// 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 gdb
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// WhereBuilder holds multiple where conditions in a group.
|
|
type WhereBuilder struct {
|
|
model *Model // A WhereBuilder should be bound to certain Model.
|
|
whereHolder []WhereHolder // Condition strings for where operation.
|
|
}
|
|
|
|
// WhereHolder is the holder for where condition preparing.
|
|
type WhereHolder struct {
|
|
Type string // Type of this holder.
|
|
Operator int // Operator for this holder.
|
|
Where any // Where parameter, which can commonly be type of string/map/struct.
|
|
Args []any // Arguments for where parameter.
|
|
Prefix string // Field prefix, eg: "user.", "order.".
|
|
}
|
|
|
|
// Builder creates and returns a WhereBuilder. Please note that the builder is chain-safe.
|
|
func (m *Model) Builder() *WhereBuilder {
|
|
b := &WhereBuilder{
|
|
model: m,
|
|
whereHolder: make([]WhereHolder, 0),
|
|
}
|
|
return b
|
|
}
|
|
|
|
// getBuilder creates and returns a cloned WhereBuilder of current WhereBuilder
|
|
func (b *WhereBuilder) getBuilder() *WhereBuilder {
|
|
return b.Clone()
|
|
}
|
|
|
|
// Clone clones and returns a WhereBuilder that is a copy of current one.
|
|
func (b *WhereBuilder) Clone() *WhereBuilder {
|
|
newBuilder := b.model.Builder()
|
|
newBuilder.whereHolder = make([]WhereHolder, len(b.whereHolder))
|
|
copy(newBuilder.whereHolder, b.whereHolder)
|
|
return newBuilder
|
|
}
|
|
|
|
// Build builds current WhereBuilder and returns the condition string and parameters.
|
|
func (b *WhereBuilder) Build() (conditionWhere string, conditionArgs []any) {
|
|
var (
|
|
ctx = b.model.GetCtx()
|
|
autoPrefix = b.model.getAutoPrefix()
|
|
tableForMappingAndFiltering = b.model.tables
|
|
)
|
|
if len(b.whereHolder) > 0 {
|
|
for _, holder := range b.whereHolder {
|
|
if holder.Prefix == "" {
|
|
holder.Prefix = autoPrefix
|
|
}
|
|
switch holder.Operator {
|
|
case whereHolderOperatorWhere, whereHolderOperatorAnd:
|
|
newWhere, newArgs := formatWhereHolder(ctx, b.model.db, formatWhereHolderInput{
|
|
WhereHolder: holder,
|
|
OmitNil: b.model.option&optionOmitNilWhere > 0,
|
|
OmitEmpty: b.model.option&optionOmitEmptyWhere > 0,
|
|
Schema: b.model.schema,
|
|
Table: tableForMappingAndFiltering,
|
|
})
|
|
if len(newWhere) > 0 {
|
|
if len(conditionWhere) == 0 {
|
|
conditionWhere = newWhere
|
|
} else if conditionWhere[0] == '(' {
|
|
conditionWhere = fmt.Sprintf(`%s AND (%s)`, conditionWhere, newWhere)
|
|
} else {
|
|
conditionWhere = fmt.Sprintf(`(%s) AND (%s)`, conditionWhere, newWhere)
|
|
}
|
|
conditionArgs = append(conditionArgs, newArgs...)
|
|
}
|
|
|
|
case whereHolderOperatorOr:
|
|
newWhere, newArgs := formatWhereHolder(ctx, b.model.db, formatWhereHolderInput{
|
|
WhereHolder: holder,
|
|
OmitNil: b.model.option&optionOmitNilWhere > 0,
|
|
OmitEmpty: b.model.option&optionOmitEmptyWhere > 0,
|
|
Schema: b.model.schema,
|
|
Table: tableForMappingAndFiltering,
|
|
})
|
|
if len(newWhere) > 0 {
|
|
if len(conditionWhere) == 0 {
|
|
conditionWhere = newWhere
|
|
} else if conditionWhere[0] == '(' {
|
|
conditionWhere = fmt.Sprintf(`%s OR (%s)`, conditionWhere, newWhere)
|
|
} else {
|
|
conditionWhere = fmt.Sprintf(`(%s) OR (%s)`, conditionWhere, newWhere)
|
|
}
|
|
conditionArgs = append(conditionArgs, newArgs...)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
// convertWhereBuilder converts parameter `where` to condition string and parameters if `where` is also a WhereBuilder.
|
|
func (b *WhereBuilder) convertWhereBuilder(where any, args []any) (newWhere any, newArgs []any) {
|
|
var builder *WhereBuilder
|
|
switch v := where.(type) {
|
|
case WhereBuilder:
|
|
builder = &v
|
|
|
|
case *WhereBuilder:
|
|
builder = v
|
|
}
|
|
if builder != nil {
|
|
conditionWhere, conditionArgs := builder.Build()
|
|
if conditionWhere != "" && (len(b.whereHolder) == 0 || len(builder.whereHolder) > 1) {
|
|
conditionWhere = "(" + conditionWhere + ")"
|
|
}
|
|
return conditionWhere, conditionArgs
|
|
}
|
|
return where, args
|
|
}
|