mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
本次PR主要针对GoFrame ORM中的软删除`SoftTime`功能进行了优化 - 新增`SoftTimeFieldType`枚举类型,用于区分创建、更新、删除三种不同的软时间字段 - 替代之前使用的魔数方式,提高类型安全性 - 将原有的6个方法精简为4个方法, 合并了三个几乎相同的`GetFieldNameAndTypeFor*`方法为统一的方法 This pull request refactors and simplifies the "soft time" (created/updated/deleted timestamp) handling logic in the database layer, making the codebase more maintainable and extensible. The changes consolidate multiple similar methods into general-purpose ones, improve cache key generation, and clarify the logic for generating and applying soft time field values and conditions. Key changes include: **Soft Time API Refactoring and Simplification** - Consolidated multiple methods (`GetFieldNameAndTypeForCreate`, `GetFieldNameAndTypeForUpdate`, `GetFieldNameAndTypeForDelete`) into a single, parameterized method `GetFieldInfo`, reducing code duplication and making it easier to support new soft time field types. The interface and implementation for soft time maintenance (`iSoftTimeMaintainer`, `softTimeMaintainer`) have been updated accordingly. [[1]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L46-R66) [[2]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L105-R180) - Combined and renamed methods for generating soft time field values and delete conditions, such as merging `GetValueByFieldTypeForCreateOrUpdate` into `GetFieldValue`, and `GetWhereConditionForDelete` into `GetDeleteCondition`. Related usages throughout the codebase have been updated to use the new methods. [[1]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L255-R206) [[2]](diffhunk://#diff-97beb485550e4381182a04bbb857a25b7f4ecd4a594dff8ac884cfaae38f3046L34-R35) [[3]](diffhunk://#diff-97beb485550e4381182a04bbb857a25b7f4ecd4a594dff8ac884cfaae38f3046L55-R55) [[4]](diffhunk://#diff-88304ddb7791aedbd83dafb68374aecab286d1356a7f2f149a8e57ac1a7f40b4L265-R267) [[5]](diffhunk://#diff-88304ddb7791aedbd83dafb68374aecab286d1356a7f2f149a8e57ac1a7f40b4L298-R311) [[6]](diffhunk://#diff-d4f6e0370e049dea52f3db9a13c64e2cfb2f7ef012433186e21179149b626d0fL944-R944) **Soft Delete Logic Improvements** - Refactored the logic for building soft delete WHERE conditions and generating update data, with clearer and more robust handling of field types and prefixes. Introduced helper methods like `buildDeleteCondition`, `GetDeleteData`, and improved error logging for invalid field types. [[1]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L287-R234) [[2]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L313-R395) **Cache Key Generation Enhancements** - Added dedicated helper functions for generating cache keys for table names, table fields, select queries, and soft time field/type lookups, improving cache consistency and code readability. [[1]](diffhunk://#diff-d57d57e6f9b342ba6fa30c4bb413e2f4f3514a8cd5ad36949eef126e5f8b7ac9R969) [[2]](diffhunk://#diff-d57d57e6f9b342ba6fa30c4bb413e2f4f3514a8cd5ad36949eef126e5f8b7ac9R980) [[3]](diffhunk://#diff-d57d57e6f9b342ba6fa30c4bb413e2f4f3514a8cd5ad36949eef126e5f8b7ac9R993-R1002) [[4]](diffhunk://#diff-b1bbe5e3995261813e4e0ac6ffee8a37c236eaa2759f2bd82e211711695a70bcL790-R790) **General Code Cleanup** - Removed redundant code, clarified comments, and improved naming throughout the affected files, making the code easier to follow and maintain. [[1]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L105-R180) [[2]](diffhunk://#diff-6c1d606032d981a7b8aecd3a7167823f76b69407a29eb9a244175a82f59965d8L255-R206) Let me know if you'd like a walkthrough of any specific part of the refactored soft time logic!
140 lines
4.4 KiB
Go
140 lines
4.4 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 (
|
|
"database/sql"
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/empty"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/internal/reflection"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
// Update does "UPDATE ... " statement for the model.
|
|
//
|
|
// If the optional parameter `dataAndWhere` is given, the dataAndWhere[0] is the updated data field,
|
|
// and dataAndWhere[1:] is treated as where condition fields.
|
|
// Also see Model.Data and Model.Where functions.
|
|
func (m *Model) Update(dataAndWhere ...any) (result sql.Result, err error) {
|
|
var ctx = m.GetCtx()
|
|
if len(dataAndWhere) > 0 {
|
|
if len(dataAndWhere) > 2 {
|
|
return m.Data(dataAndWhere[0]).Where(dataAndWhere[1], dataAndWhere[2:]...).Update()
|
|
} else if len(dataAndWhere) == 2 {
|
|
return m.Data(dataAndWhere[0]).Where(dataAndWhere[1]).Update()
|
|
} else {
|
|
return m.Data(dataAndWhere[0]).Update()
|
|
}
|
|
}
|
|
defer func() {
|
|
if err == nil {
|
|
m.checkAndRemoveSelectCache(ctx)
|
|
}
|
|
}()
|
|
if m.data == nil {
|
|
return nil, gerror.NewCode(gcode.CodeMissingParameter, "updating table with empty data")
|
|
}
|
|
var (
|
|
newData any
|
|
stm = m.softTimeMaintainer()
|
|
reflectInfo = reflection.OriginTypeAndKind(m.data)
|
|
conditionWhere, conditionExtra, conditionArgs = m.formatCondition(ctx, false, false)
|
|
conditionStr = conditionWhere + conditionExtra
|
|
fieldNameUpdate, fieldTypeUpdate = stm.GetFieldInfo(ctx, "", m.tablesInit, SoftTimeFieldUpdate)
|
|
)
|
|
if fieldNameUpdate != "" && (m.unscoped || m.isFieldInFieldsEx(fieldNameUpdate)) {
|
|
fieldNameUpdate = ""
|
|
}
|
|
|
|
newData, err = m.filterDataForInsertOrUpdate(m.data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
switch reflectInfo.OriginKind {
|
|
case reflect.Map, reflect.Struct:
|
|
var dataMap = anyValueToMapBeforeToRecord(newData)
|
|
// Automatically update the record updating time.
|
|
if fieldNameUpdate != "" && empty.IsNil(dataMap[fieldNameUpdate]) {
|
|
dataValue := stm.GetFieldValue(ctx, fieldTypeUpdate, false)
|
|
dataMap[fieldNameUpdate] = dataValue
|
|
}
|
|
newData = dataMap
|
|
|
|
default:
|
|
var updateStr = gconv.String(newData)
|
|
// Automatically update the record updating time.
|
|
if fieldNameUpdate != "" && !gstr.Contains(updateStr, fieldNameUpdate) {
|
|
dataValue := stm.GetFieldValue(ctx, fieldTypeUpdate, false)
|
|
updateStr += fmt.Sprintf(`,%s=?`, fieldNameUpdate)
|
|
conditionArgs = append([]any{dataValue}, conditionArgs...)
|
|
}
|
|
newData = updateStr
|
|
}
|
|
|
|
if !gstr.ContainsI(conditionStr, " WHERE ") {
|
|
intlog.Printf(
|
|
ctx,
|
|
`sql condition string "%s" has no WHERE for UPDATE operation, fieldNameUpdate: %s`,
|
|
conditionStr, fieldNameUpdate,
|
|
)
|
|
return nil, gerror.NewCode(
|
|
gcode.CodeMissingParameter,
|
|
"there should be WHERE condition statement for UPDATE operation",
|
|
)
|
|
}
|
|
|
|
in := &HookUpdateInput{
|
|
internalParamHookUpdate: internalParamHookUpdate{
|
|
internalParamHook: internalParamHook{
|
|
link: m.getLink(true),
|
|
},
|
|
handler: m.hookHandler.Update,
|
|
},
|
|
Model: m,
|
|
Table: m.tables,
|
|
Schema: m.schema,
|
|
Data: newData,
|
|
Condition: conditionStr,
|
|
Args: m.mergeArguments(conditionArgs),
|
|
}
|
|
return in.Next(ctx)
|
|
}
|
|
|
|
// UpdateAndGetAffected performs update statement and returns the affected rows number.
|
|
func (m *Model) UpdateAndGetAffected(dataAndWhere ...any) (affected int64, err error) {
|
|
result, err := m.Update(dataAndWhere...)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return result.RowsAffected()
|
|
}
|
|
|
|
// Increment increments a column's value by a given amount.
|
|
// The parameter `amount` can be type of float or integer.
|
|
func (m *Model) Increment(column string, amount any) (sql.Result, error) {
|
|
return m.getModel().Data(column, &Counter{
|
|
Field: column,
|
|
Value: gconv.Float64(amount),
|
|
}).Update()
|
|
}
|
|
|
|
// Decrement decrements a column's value by a given amount.
|
|
// The parameter `amount` can be type of float or integer.
|
|
func (m *Model) Decrement(column string, amount any) (sql.Result, error) {
|
|
return m.getModel().Data(column, &Counter{
|
|
Field: column,
|
|
Value: -gconv.Float64(amount),
|
|
}).Update()
|
|
}
|