Skip to content

Commit

Permalink
rewrite coalesce
Browse files Browse the repository at this point in the history
  • Loading branch information
@arily
arily committed Dec 3, 2023
1 parent 9c30c19 commit bc0f2a2
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 96 deletions.
4 changes: 2 additions & 2 deletions app/repositories/achievements.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM achievements
WHERE id = COALESCE(:id, id)
OR name = COALESCE(:name, name)
WHERE COALESCE(id = :id, :id IS NULL)
OR COALESCE(name = :name, :name IS NULL)
"""
params: dict[str, Any] = {
"id": id,
Expand Down
16 changes: 8 additions & 8 deletions app/repositories/channels.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM channels
WHERE id = COALESCE(:id, id)
AND name = COALESCE(:name, name)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(name = :name, :name IS NULL)
"""
params: dict[str, Any] = {
"id": id,
Expand All @@ -114,9 +114,9 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM channels
WHERE read_priv = COALESCE(:read_priv, read_priv)
AND write_priv = COALESCE(:write_priv, write_priv)
AND auto_join = COALESCE(:auto_join, auto_join)
WHERE COALESCE(read_priv = :read_priv, :read_priv IS NULL)
AND COALESCE(write_priv = :write_priv, :write_priv IS NULL)
AND COALESCE(auto_join = :auto_join, :auto_join IS NULL)
"""
params: dict[str, Any] = {
"read_priv": read_priv,
Expand All @@ -140,9 +140,9 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM channels
WHERE read_priv = COALESCE(:read_priv, read_priv)
AND write_priv = COALESCE(:write_priv, write_priv)
AND auto_join = COALESCE(:auto_join, auto_join)
WHERE COALESCE(read_priv = :read_priv, :read_priv IS NULL)
AND COALESCE(write_priv = :write_priv, :write_priv IS NULL)
AND COALESCE(auto_join = :auto_join, :auto_join IS NULL)
"""
params: dict[str, Any] = {
"read_priv": read_priv,
Expand Down
8 changes: 4 additions & 4 deletions app/repositories/clans.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM clans
WHERE id = COALESCE(:id, id)
AND name = COALESCE(:name, name)
AND tag = COALESCE(:tag, tag)
AND owner = COALESCE(:owner, owner)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(name = :name, :name IS NULL)
AND COALESCE(tag = :tag, :tag IS NULL)
AND COALESCE(owner = :owner, :owner IS NULL)
"""
params: dict[str, Any] = {"id": id, "name": name, "tag": tag, "owner": owner}
clan = await app.state.services.database.fetch_one(query, params)
Expand Down
12 changes: 6 additions & 6 deletions app/repositories/ingame_logins.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM ingame_logins
WHERE userid = COALESCE(:userid, userid)
AND ip = COALESCE(:ip, ip)
WHERE COALESCE(userid = :userid, :userid IS NULL)
AND COALESCE(ip = :ip, :ip IS NULL)
"""
params: dict[str, Any] = {
"userid": user_id,
Expand All @@ -123,10 +123,10 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM ingame_logins
WHERE userid = COALESCE(:userid, userid)
AND ip = COALESCE(:ip, ip)
AND osu_ver = COALESCE(:osu_ver, osu_ver)
AND osu_stream = COALESCE(:osu_stream, osu_stream)
WHERE COALESCE(userid = :userid, :userid IS NULL)
AND COALESCE(ip = :ip, :ip IS NULL)
AND COALESCE(osu_ver = :osu_ver, :osu_ver IS NULL)
AND COALESCE(osu_stream = :osu_stream, :osu_stream IS NULL)
"""
params: dict[str, Any] = {
"userid": user_id,
Expand Down
42 changes: 21 additions & 21 deletions app/repositories/logs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM logs
WHERE id = COALESCE(:id, id)
AND from = COALESCE(:from, from)
AND to = COALESCE(:to, to)
AND action = COALESCE(:action, action)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(from = :from, :from IS NULL)
AND COALESCE(to = :to, :to IS NULL)
AND COALESCE(action = :action, :action IS NULL)
"""
params = {
"id": id,
Expand All @@ -100,12 +100,12 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM logs
WHERE id = COALESCE(:id, id)
AND from = COALESCE(:from, from)
AND to = COALESCE(:to, to)
AND action = COALESCE(:action, action)
AND msg = COALESCE(:msg, msg)
AND time = COALESCE(:time, time)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(from = :from, :from IS NULL)
AND COALESCE(to = :to, :to IS NULL)
AND COALESCE(action = :action, :action IS NULL)
AND COALESCE(msg = :msg, :msg IS NULL)
AND COALESCE(time = :time, :time IS NULL)
"""
params = {
"id": id,
Expand Down Expand Up @@ -134,12 +134,12 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM logs
WHERE id = COALESCE(:id, id)
AND from = COALESCE(:from, from)
AND to = COALESCE(:to, to)
AND action = COALESCE(:action, action)
AND msg = COALESCE(:msg, msg)
AND time = COALESCE(:time, time)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(from = :from, :from IS NULL)
AND COALESCE(to = :to, :to IS NULL)
AND COALESCE(action = :action, :action IS NULL)
AND COALESCE(msg = :msg, :msg IS NULL)
AND COALESCE(time = :time, :time IS NULL)
"""
params = {
"id": id,
Expand Down Expand Up @@ -173,11 +173,11 @@ async def update(
"""Update a log entry in the database."""
query = """\
UPDATE logs
SET from = COALESCE(:from, from),
to = COALESCE(:to, to),
action = COALESCE(:action, action),
msg = COALESCE(:msg, msg),
time = COALESCE(:time, time)
SET COALESCE(from = :from, :from IS NULL),
COALESCE(to = :to, :to IS NULL),
COALESCE(action = :action, :action IS NULL),
COALESCE(msg = :msg, :msg IS NULL),
COALESCE(time = :time, :time IS NULL)
WHERE id = :id
"""
params = {
Expand Down
14 changes: 7 additions & 7 deletions app/repositories/mails.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM mail
WHERE from_id = COALESCE(:from_id, from_id)
AND to_id = COALESCE(:to_id, to_id)
AND time = COALESCE(:time, time)
AND read = COALESCE(:read, read)
WHERE COALESCE(from_id = :from_id, :from_id IS NULL)
AND COALESCE(to_id = :to_id, :to_id IS NULL)
AND COALESCE(time = :time, :time IS NULL)
AND COALESCE(read = :read, :read IS NULL)
"""
params = {
"from_id": from_id,
Expand All @@ -84,9 +84,9 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM mail
WHERE from_id = COALESCE(:from_id, from_id)
AND to_id = COALESCE(:to_id, to_id)
AND time = COALESCE(:time, time)
WHERE COALESCE(from_id = :from_id, :from_id IS NULL)
AND COALESCE(to_id = :to_id, :to_id IS NULL)
AND COALESCE(time = :time, :time IS NULL)
AND `read` = COALESCE(:read, read)
"""
params = {
Expand Down
38 changes: 19 additions & 19 deletions app/repositories/maps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ async def fetch_one(
query = f"""\
SELECT {READ_PARAMS}
FROM maps
WHERE id = COALESCE(:id, id)
AND md5 = COALESCE(:md5, md5)
AND filename = COALESCE(:filename, filename)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(md5 = :md5, :md5 IS NULL)
AND COALESCE(filename = :filename, :filename IS NULL)
"""
params: dict[str, Any] = {
"id": id,
Expand All @@ -214,14 +214,14 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM maps
WHERE server = COALESCE(:server, server)
AND set_id = COALESCE(:set_id, set_id)
AND status = COALESCE(:status, status)
AND artist = COALESCE(:artist, artist)
AND creator = COALESCE(:creator, creator)
AND filename = COALESCE(:filename, filename)
AND mode = COALESCE(:mode, mode)
AND frozen = COALESCE(:frozen, frozen)
WHERE COALESCE(server = :server, :server IS NULL)
AND COALESCE(set_id = :set_id, :set_id IS NULL)
AND COALESCE(status = :status, :status IS NULL)
AND COALESCE(artist = :artist, :artist IS NULL)
AND COALESCE(creator = :creator, :creator IS NULL)
AND COALESCE(filename = :filename, :filename IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
AND COALESCE(frozen = :frozen, :frozen IS NULL)
"""
params: dict[str, Any] = {
Expand Down Expand Up @@ -255,14 +255,14 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM maps
WHERE server = COALESCE(:server, server)
AND set_id = COALESCE(:set_id, set_id)
AND status = COALESCE(:status, status)
AND artist = COALESCE(:artist, artist)
AND creator = COALESCE(:creator, creator)
AND filename = COALESCE(:filename, filename)
AND mode = COALESCE(:mode, mode)
AND frozen = COALESCE(:frozen, frozen)
WHERE COALESCE(server = :server, :server IS NULL)
AND COALESCE(set_id = :set_id, :set_id IS NULL)
AND COALESCE(status = :status, :status IS NULL)
AND COALESCE(artist = :artist, :artist IS NULL)
AND COALESCE(creator = :creator, :creator IS NULL)
AND COALESCE(filename = :filename, :filename IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
AND COALESCE(frozen = :frozen, :frozen IS NULL)
"""
params: dict[str, Any] = {
"server": server,
Expand Down
30 changes: 15 additions & 15 deletions app/repositories/players.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ async def fetch_one(
query = f"""\
SELECT {'*' if fetch_all_fields else READ_PARAMS}
FROM users
WHERE id = COALESCE(:id, id)
AND safe_name = COALESCE(:safe_name, safe_name)
AND email = COALESCE(:email, email)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(safe_name = :safe_name, :safe_name IS NULL)
AND COALESCE(email = :email, :email IS NULL)
"""
params: dict[str, Any] = {
"id": id,
Expand All @@ -156,12 +156,12 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM users
WHERE priv = COALESCE(:priv, priv)
AND country = COALESCE(:country, country)
AND clan_id = COALESCE(:clan_id, clan_id)
AND clan_priv = COALESCE(:clan_priv, clan_priv)
AND preferred_mode = COALESCE(:preferred_mode, preferred_mode)
AND play_style = COALESCE(:play_style, play_style)
WHERE COALESCE(priv = :priv, :priv IS NULL)
AND COALESCE(country = :country, :country IS NULL)
AND COALESCE(clan_id = :clan_id, :clan_id IS NULL)
AND COALESCE(clan_priv = :clan_priv, :clan_priv IS NULL)
AND COALESCE(preferred_mode = :preferred_mode, :preferred_mode IS NULL)
AND COALESCE(play_style = :play_style, :play_style IS NULL)
"""
params: dict[str, Any] = {
"priv": priv,
Expand Down Expand Up @@ -190,12 +190,12 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM users
WHERE priv = COALESCE(:priv, priv)
AND country = COALESCE(:country, country)
AND clan_id = COALESCE(:clan_id, clan_id)
AND clan_priv = COALESCE(:clan_priv, clan_priv)
AND preferred_mode = COALESCE(:preferred_mode, preferred_mode)
AND play_style = COALESCE(:play_style, play_style)
WHERE COALESCE(priv = :priv, :priv IS NULL)
AND COALESCE(country = :country, :country IS NULL)
AND COALESCE(clan_id = :clan_id, :clan_id IS NULL)
AND COALESCE(clan_priv = :clan_priv, :clan_priv IS NULL)
AND COALESCE(preferred_mode = :preferred_mode, :preferred_mode IS NULL)
AND COALESCE(play_style = :play_style, :play_style IS NULL)
"""
params: dict[str, Any] = {
"priv": priv,
Expand Down
20 changes: 10 additions & 10 deletions app/repositories/scores.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM scores
WHERE map_md5 = COALESCE(:map_md5, map_md5)
AND mods = COALESCE(:mods, mods)
AND status = COALESCE(:status, status)
AND mode = COALESCE(:mode, mode)
AND userid = COALESCE(:userid, userid)
WHERE COALESCE(map_md5 = :map_md5, :map_md5 IS NULL)
AND COALESCE(mods = :mods, :mods IS NULL)
AND COALESCE(status = :status, :status IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
AND COALESCE(userid = :userid, :userid IS NULL)
"""
params: dict[str, Any] = {
"map_md5": map_md5,
Expand All @@ -216,11 +216,11 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM scores
WHERE map_md5 = COALESCE(:map_md5, map_md5)
AND mods = COALESCE(:mods, mods)
AND status = COALESCE(:status, status)
AND mode = COALESCE(:mode, mode)
AND userid = COALESCE(:userid, userid)
WHERE COALESCE(map_md5 = :map_md5, :map_md5 IS NULL)
AND COALESCE(mods = :mods, :mods IS NULL)
AND COALESCE(status = :status, :status IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
AND COALESCE(userid = :userid, :userid IS NULL)
"""
params: dict[str, Any] = {
"map_md5": map_md5,
Expand Down
8 changes: 4 additions & 4 deletions app/repositories/stats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ async def fetch_count(
query = """\
SELECT COUNT(*) AS count
FROM stats
WHERE id = COALESCE(:id, id)
AND mode = COALESCE(:mode, mode)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
"""
params: dict[str, Any] = {
"id": player_id,
Expand All @@ -182,8 +182,8 @@ async def fetch_many(
query = f"""\
SELECT {READ_PARAMS}
FROM stats
WHERE id = COALESCE(:id, id)
AND mode = COALESCE(:mode, mode)
WHERE COALESCE(id = :id, :id IS NULL)
AND COALESCE(mode = :mode, :mode IS NULL)
"""
params: dict[str, Any] = {
"id": player_id,
Expand Down

0 comments on commit bc0f2a2

Please sign in to comment.