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.
172 lines
6.5 KiB
Go
172 lines
6.5 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"
|
|
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
)
|
|
|
|
// doWhereType sets the condition statement for the model. The parameter `where` can be type of
|
|
// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
|
|
// multiple conditions will be joined into where statement using "AND".
|
|
func (b *WhereBuilder) doWhereType(whereType string, where any, args ...any) *WhereBuilder {
|
|
where, args = b.convertWhereBuilder(where, args)
|
|
|
|
builder := b.getBuilder()
|
|
if builder.whereHolder == nil {
|
|
builder.whereHolder = make([]WhereHolder, 0)
|
|
}
|
|
if whereType == "" {
|
|
if len(args) == 0 {
|
|
whereType = whereHolderTypeNoArgs
|
|
} else {
|
|
whereType = whereHolderTypeDefault
|
|
}
|
|
}
|
|
builder.whereHolder = append(builder.whereHolder, WhereHolder{
|
|
Type: whereType,
|
|
Operator: whereHolderOperatorWhere,
|
|
Where: where,
|
|
Args: args,
|
|
})
|
|
return builder
|
|
}
|
|
|
|
// doWherefType builds condition string using fmt.Sprintf and arguments.
|
|
// Note that if the number of `args` is more than the placeholder in `format`,
|
|
// the extra `args` will be used as the where condition arguments of the Model.
|
|
func (b *WhereBuilder) doWherefType(t string, format string, args ...any) *WhereBuilder {
|
|
var (
|
|
placeHolderCount = gstr.Count(format, "?")
|
|
conditionStr = fmt.Sprintf(format, args[:len(args)-placeHolderCount]...)
|
|
)
|
|
return b.doWhereType(t, conditionStr, args[len(args)-placeHolderCount:]...)
|
|
}
|
|
|
|
// Where sets the condition statement for the builder. The parameter `where` can be type of
|
|
// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
|
|
// multiple conditions will be joined into where statement using "AND".
|
|
// Eg:
|
|
// Where("uid=10000")
|
|
// Where("uid", 10000)
|
|
// Where("money>? AND name like ?", 99999, "vip_%")
|
|
// Where("uid", 1).Where("name", "john")
|
|
// Where("status IN (?)", g.Slice{1,2,3})
|
|
// Where("age IN(?,?)", 18, 50)
|
|
// Where(User{ Id : 1, UserName : "john"}).
|
|
func (b *WhereBuilder) Where(where any, args ...any) *WhereBuilder {
|
|
return b.doWhereType(``, where, args...)
|
|
}
|
|
|
|
// Wheref builds condition string using fmt.Sprintf and arguments.
|
|
// Note that if the number of `args` is more than the placeholder in `format`,
|
|
// the extra `args` will be used as the where condition arguments of the Model.
|
|
// Eg:
|
|
// Wheref(`amount<? and status=%s`, "paid", 100) => WHERE `amount`<100 and status='paid'
|
|
// Wheref(`amount<%d and status=%s`, 100, "paid") => WHERE `amount`<100 and status='paid'
|
|
func (b *WhereBuilder) Wheref(format string, args ...any) *WhereBuilder {
|
|
return b.doWherefType(``, format, args...)
|
|
}
|
|
|
|
// WherePri does the same logic as Model.Where except that if the parameter `where`
|
|
// is a single condition like int/string/float/slice, it treats the condition as the primary
|
|
// key value. That is, if primary key is "id" and given `where` parameter as "123", the
|
|
// WherePri function treats the condition as "id=123", but Model.Where treats the condition
|
|
// as string "123".
|
|
func (b *WhereBuilder) WherePri(where any, args ...any) *WhereBuilder {
|
|
if len(args) > 0 {
|
|
return b.Where(where, args...)
|
|
}
|
|
newWhere := GetPrimaryKeyCondition(b.model.getPrimaryKey(), where)
|
|
return b.Where(newWhere[0], newWhere[1:]...)
|
|
}
|
|
|
|
// WhereLT builds `column < value` statement.
|
|
func (b *WhereBuilder) WhereLT(column string, value any) *WhereBuilder {
|
|
return b.Wheref(`%s < ?`, b.model.QuoteWord(column), value)
|
|
}
|
|
|
|
// WhereLTE builds `column <= value` statement.
|
|
func (b *WhereBuilder) WhereLTE(column string, value any) *WhereBuilder {
|
|
return b.Wheref(`%s <= ?`, b.model.QuoteWord(column), value)
|
|
}
|
|
|
|
// WhereGT builds `column > value` statement.
|
|
func (b *WhereBuilder) WhereGT(column string, value any) *WhereBuilder {
|
|
return b.Wheref(`%s > ?`, b.model.QuoteWord(column), value)
|
|
}
|
|
|
|
// WhereGTE builds `column >= value` statement.
|
|
func (b *WhereBuilder) WhereGTE(column string, value any) *WhereBuilder {
|
|
return b.Wheref(`%s >= ?`, b.model.QuoteWord(column), value)
|
|
}
|
|
|
|
// WhereBetween builds `column BETWEEN min AND max` statement.
|
|
func (b *WhereBuilder) WhereBetween(column string, min, max any) *WhereBuilder {
|
|
return b.Wheref(`%s BETWEEN ? AND ?`, b.model.QuoteWord(column), min, max)
|
|
}
|
|
|
|
// WhereLike builds `column LIKE like` statement.
|
|
func (b *WhereBuilder) WhereLike(column string, like string) *WhereBuilder {
|
|
return b.Wheref(`%s LIKE ?`, b.model.QuoteWord(column), like)
|
|
}
|
|
|
|
// WhereIn builds `column IN (in)` statement.
|
|
func (b *WhereBuilder) WhereIn(column string, in any) *WhereBuilder {
|
|
return b.doWherefType(whereHolderTypeIn, `%s IN (?)`, b.model.QuoteWord(column), in)
|
|
}
|
|
|
|
// WhereNull builds `columns[0] IS NULL AND columns[1] IS NULL ...` statement.
|
|
func (b *WhereBuilder) WhereNull(columns ...string) *WhereBuilder {
|
|
builder := b
|
|
for _, column := range columns {
|
|
builder = builder.Wheref(`%s IS NULL`, b.model.QuoteWord(column))
|
|
}
|
|
return builder
|
|
}
|
|
|
|
// WhereNotBetween builds `column NOT BETWEEN min AND max` statement.
|
|
func (b *WhereBuilder) WhereNotBetween(column string, min, max any) *WhereBuilder {
|
|
return b.Wheref(`%s NOT BETWEEN ? AND ?`, b.model.QuoteWord(column), min, max)
|
|
}
|
|
|
|
// WhereNotLike builds `column NOT LIKE like` statement.
|
|
func (b *WhereBuilder) WhereNotLike(column string, like any) *WhereBuilder {
|
|
return b.Wheref(`%s NOT LIKE ?`, b.model.QuoteWord(column), like)
|
|
}
|
|
|
|
// WhereNot builds `column != value` statement.
|
|
func (b *WhereBuilder) WhereNot(column string, value any) *WhereBuilder {
|
|
return b.Wheref(`%s != ?`, b.model.QuoteWord(column), value)
|
|
}
|
|
|
|
// WhereNotIn builds `column NOT IN (in)` statement.
|
|
func (b *WhereBuilder) WhereNotIn(column string, in any) *WhereBuilder {
|
|
return b.doWherefType(whereHolderTypeIn, `%s NOT IN (?)`, b.model.QuoteWord(column), in)
|
|
}
|
|
|
|
// WhereNotNull builds `columns[0] IS NOT NULL AND columns[1] IS NOT NULL ...` statement.
|
|
func (b *WhereBuilder) WhereNotNull(columns ...string) *WhereBuilder {
|
|
builder := b
|
|
for _, column := range columns {
|
|
builder = builder.Wheref(`%s IS NOT NULL`, b.model.QuoteWord(column))
|
|
}
|
|
return builder
|
|
}
|
|
|
|
// WhereExists builds `EXISTS (subQuery)` statement.
|
|
func (b *WhereBuilder) WhereExists(subQuery *Model) *WhereBuilder {
|
|
return b.Wheref(`EXISTS (?)`, subQuery)
|
|
}
|
|
|
|
// WhereNotExists builds `NOT EXISTS (subQuery)` statement.
|
|
func (b *WhereBuilder) WhereNotExists(subQuery *Model) *WhereBuilder {
|
|
return b.Wheref(`NOT EXISTS (?)`, subQuery)
|
|
}
|