summaryrefslogtreecommitdiff
path: root/internal/db/bundb/util.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-10-08 13:50:48 +0200
committerLibravatar GitHub <noreply@github.com>2022-10-08 13:50:48 +0200
commitaa07750bdb4dacdb1be39d765114915bba3fc29f (patch)
tree30e9e5052f607f8c8e4f7d518559df8706275e0f /internal/db/bundb/util.go
parent[performance] cache domains after max retries in transport (#884) (diff)
downloadgotosocial-aa07750bdb4dacdb1be39d765114915bba3fc29f.tar.xz
[chore] Standardize database queries, use `bun.Ident()` properly (#886)
* use bun.Ident for user queries * use bun.Ident for account queries * use bun.Ident for media queries * add DeleteAccount func * remove CaseInsensitive in Where+use Ident ipv Safe * update admin db * update domain, use ident * update emoji, use ident * update instance queries, use bun.Ident * fix media * update mentions, use bun ident * update relationship + tests * use tableexpr * add test follows to bun db test suite * update notifications * updatebyprimarykey => updatebyid * fix session * prefer explicit ID to pk * fix little fucky wucky * remove workaround * use proper db func for attachment selection * update status db * add m2m entries in test rig * fix up timeline * go fmt * fix status put issue * update GetAccountStatuses
Diffstat (limited to 'internal/db/bundb/util.go')
-rw-r--r--internal/db/bundb/util.go16
1 files changed, 2 insertions, 14 deletions
diff --git a/internal/db/bundb/util.go b/internal/db/bundb/util.go
index 434d12f32..34f7eb76f 100644
--- a/internal/db/bundb/util.go
+++ b/internal/db/bundb/util.go
@@ -85,14 +85,8 @@ func parseWhere(w db.Where) (query string, args []interface{}) {
return
}
- if w.CaseInsensitive {
- query = "LOWER(?) != LOWER(?)"
- args = []interface{}{bun.Safe(w.Key), w.Value}
- return
- }
-
query = "? != ?"
- args = []interface{}{bun.Safe(w.Key), w.Value}
+ args = []interface{}{bun.Ident(w.Key), w.Value}
return
}
@@ -102,13 +96,7 @@ func parseWhere(w db.Where) (query string, args []interface{}) {
return
}
- if w.CaseInsensitive {
- query = "LOWER(?) = LOWER(?)"
- args = []interface{}{bun.Safe(w.Key), w.Value}
- return
- }
-
query = "? = ?"
- args = []interface{}{bun.Safe(w.Key), w.Value}
+ args = []interface{}{bun.Ident(w.Key), w.Value}
return
}