From 02e9f18c43df1b0fbe2d410036d4d6a03d9ca830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Fri, 14 Feb 2025 22:18:04 +0900 Subject: [PATCH] fix(sqlite): slice operation --- go.mod | 2 +- go.sum | 4 ++-- job/main.go | 6 ++++-- job/regexqa.go | 7 +++++-- job/web.go | 4 +++- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 4908658..dc140ea 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/FloatTech/floatbox v0.0.0-20241106130736-5aea0a935024 github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9 github.com/FloatTech/rendercard v0.2.0 - github.com/FloatTech/sqlite v1.7.0 + github.com/FloatTech/sqlite v1.7.1 github.com/FloatTech/zbpctrl v1.7.0 github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 diff --git a/go.sum b/go.sum index e1b1022..614ce8b 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9 h1:IzZLuM/f github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs= github.com/FloatTech/rendercard v0.2.0 h1:PBTZ2gCEy/dAEGSfWecrGTrWDYpiBJD1dVzNDDaOxh4= github.com/FloatTech/rendercard v0.2.0/go.mod h1:Sbojcy1t3NfFz7/WicZRmR/uKFxNMYkKF8qHx69dxY0= -github.com/FloatTech/sqlite v1.7.0 h1:FGSn4pCR12kESozn7IvNx3U39dwR/AcFM9oPyGACsl0= -github.com/FloatTech/sqlite v1.7.0/go.mod h1:/4tzfCGhrZnnjC1U8vcfwGQeF6eR649fhOsS3+Le0+s= +github.com/FloatTech/sqlite v1.7.1 h1:XKUY0+MNaRmvEIgRv7QLbl7PFVpUfQ72+XQg+no2Vq0= +github.com/FloatTech/sqlite v1.7.1/go.mod h1:/4tzfCGhrZnnjC1U8vcfwGQeF6eR649fhOsS3+Le0+s= github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562 h1:snfw7FNFym1eNnLrQ/VCf80LiQo9C7jHgrunZDwiRcY= github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/zbpctrl v1.7.0 h1:Hxo6EIhJo+pHjcQP9QgIJgluaT1pHH99zkk3njqTNMo= diff --git a/job/main.go b/job/main.go index 9a39a34..c506fea 100644 --- a/job/main.go +++ b/job/main.go @@ -468,7 +468,8 @@ func rmcmd(bot, caller int64, cron string) error { return err } if len(delids) > 0 { - return db.Del(bots, "WHERE id IN ?", delids) + q, s := sql.QuerySet("WHERE id", "IN", delids) + return db.Del(bots, q, s...) } return nil } @@ -492,7 +493,8 @@ func delcmd(bot int64, cron string) error { return err } if len(delids) > 0 { - return db.Del(bots, "WHERE id IN ?", delids) + q, s := sql.QuerySet("WHERE id", "IN", delids) + return db.Del(bots, q, s...) } return nil } diff --git a/job/regexqa.go b/job/regexqa.go index 5ce4cbb..6e3741a 100644 --- a/job/regexqa.go +++ b/job/regexqa.go @@ -15,6 +15,7 @@ import ( "github.com/FloatTech/floatbox/binary" "github.com/FloatTech/floatbox/process" + sql "github.com/FloatTech/sqlite" "github.com/FloatTech/zbputils/ctxext" ) @@ -91,7 +92,8 @@ func removeRegex(gid, uid int64, bots, pattern string) error { return nil }, cr) if len(delids) > 0 { - return db.Del(bots, "WHERE id IN ?", delids) + q, s := sql.QuerySet("WHERE id", "IN", delids) + return db.Del(bots, q, s...) } return nil } @@ -110,7 +112,8 @@ func removeInjectRegex(gid, uid int64, bots, pattern string) error { return nil }, cr) if len(delids) > 0 { - return db.Del(bots, "WHERE id IN ?", delids) + q, s := sql.QuerySet("WHERE id", "IN", delids) + return db.Del(bots, q, s...) } return nil } diff --git a/job/web.go b/job/web.go index 8c11fac..ea30412 100644 --- a/job/web.go +++ b/job/web.go @@ -9,6 +9,7 @@ import ( "github.com/FloatTech/floatbox/binary" "github.com/FloatTech/floatbox/process" + sql "github.com/FloatTech/sqlite" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" @@ -448,7 +449,8 @@ func Delete(req *DeleteReq) (err error) { return } if len(delids) > 0 { - err = db.Del(bots, "WHERE id IN ?", delids) + q, s := sql.QuerySet("WHERE id", "IN", delids) + err = db.Del(bots, q, s...) if err != nil { return }