Skip to content

fix: 修复在没有where条件情况下limit丢失的问题 #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caibirdme merged 1 commit into from
Mar 12, 2025
Merged

fix: 修复在没有where条件情况下limit丢失的问题 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions builder/dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,12 +452,14 @@ func buildUpdate(table string, update map[string]interface{}, limit uint, condit

func buildDelete(table string, limit uint, conditions ...Comparable) (string, []interface{}, error) {
whereString, vals := whereConnector("AND", conditions...)
if "" == whereString {
return fmt.Sprintf("DELETE FROM %s", table), nil, nil
}
format := "DELETE FROM %s WHERE %s"

cond := fmt.Sprintf(format, quoteField(table), whereString)
format := "DELETE FROM %s"
args := make([]interface{}, 0, 2)
args = append(args, quoteField(table))
if len(whereString) > 0 {
format += " WHERE %s"
args = append(args, whereString)
}
cond := fmt.Sprintf(format, args...)
if limit > 0 {
cond += " LIMIT ?"
vals = append(vals, int(limit))
Expand Down
14 changes: 14 additions & 0 deletions builder/dao_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,20 @@ func TestBuildDelete(t *testing.T) {
outVals: []interface{}{2, "tt", 1, 5},
outErr: nil,
},
{
table: "tb",
limit: 5,
outStr: "DELETE FROM tb LIMIT ?",
outVals: []interface{}{5},
outErr: nil,
},
{
table: "tb",
limit: 0,
outStr: "DELETE FROM tb",
outVals: nil,
outErr: nil,
},
}
ass := assert.New(t)
for _, tc := range data {
Expand Down