cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 17:14:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

backticks some usages of rank in querys (#95719)

Browse Source 
## About The Pull Request
See title. I looked pretty hard and only found these as having this
issue.
## Why It's Good For The Game
I'm mostly working off of other peoples wisdom here but `rank` is a
reserved word in sql, and as we do in MOST of our other querys.
backticking it prevents that from being an issue (and therefore fixes
some sql errors that CAN happen depending on version (my issues happened
with mysql, but apparently dont occur with heididb))
## Changelog
~~N/A as i dont acctually think this happens in TG rn unless yalls
housekeeping tab on the admin panel is broken as well.~~
🆑
fix: A handful of permissions panel querys now work again
/🆑
This commit is contained in:
FalloutFalcon
2026-04-11 12:40:59 -05:00
committed by GitHub
parent 9df37ce85f
commit c7faae3626
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_ranks.dm
+2 -2
View File
@@ -363,7 +363,7 @@ GLOBAL_PROTECT(protected_ranks)
continue
var/flags_to_check = flags.Join(" != [R_EVERYTHING] AND ") + " != [R_EVERYTHING]"
var/datum/db_query/query_check_everything_ranks = SSdbcore.NewQuery(
"SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] WHERE rank = :rank AND ([flags_to_check])",
"SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] WHERE `rank` = :rank AND ([flags_to_check])",
list("rank" = R.name)
)
if(!query_check_everything_ranks.Execute())
@@ -372,7 +372,7 @@ GLOBAL_PROTECT(protected_ranks)
if(query_check_everything_ranks.NextRow()) //no row is returned if the rank already has the correct flag value
var/flags_to_update = flags.Join(" = [R_EVERYTHING], ") + " = [R_EVERYTHING]"
var/datum/db_query/query_update_everything_ranks = SSdbcore.NewQuery(
"UPDATE [format_table_name("admin_ranks")] SET [flags_to_update] WHERE rank = :rank",
"UPDATE [format_table_name("admin_ranks")] SET [flags_to_update] WHERE `rank` = :rank",
list("rank" = R.name)
)
if(!query_update_everything_ranks.Execute())
code/modules/admin/permissionedit.dm
+6 -6
View File
@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(permission_action_types, list(
admins_by_rank[composed_rank.name] |= list(stored_key)
// Then, pull the full list of DB ranks
var/datum/db_query/query_extract_ranks = SSdbcore.NewQuery("SELECT rank, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]")
var/datum/db_query/query_extract_ranks = SSdbcore.NewQuery("SELECT `rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]")
if(!query_extract_ranks.warn_execute())
qdel(query_extract_ranks)
return
@@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(permission_action_types, list(
QDEL_NULL(query_extract_admins)
// Then, pull the full list of DB ranks to purity check against
var/datum/db_query/query_extract_ranks = SSdbcore.NewQuery("SELECT rank, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]")
var/datum/db_query/query_extract_ranks = SSdbcore.NewQuery("SELECT `rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]")
if(!query_extract_ranks.warn_execute())
qdel(query_extract_ranks)
return
@@ -1082,7 +1082,7 @@ GLOBAL_LIST_INIT(permission_action_types, list(
if(use_db)
var/datum/db_query/query_db_rank_info = SSdbcore.NewQuery({"
SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]
WHERE rank = :rank_name
WHERE `rank` = :rank_name
"}, list("rank_name" = admin_rank))
if(!query_db_rank_info.warn_execute())
qdel(query_db_rank_info)
@@ -1169,19 +1169,19 @@ GLOBAL_LIST_INIT(permission_action_types, list(
query_update_rank = SSdbcore.NewQuery({"
UPDATE [format_table_name("admin_ranks")]
SET flags = :flags
WHERE rank = :rank_name
WHERE `rank` = :rank_name
"}, list("rank_name" = admin_rank, "flags" = new_flags))
if("Excluded Rights")
query_update_rank = SSdbcore.NewQuery({"
UPDATE [format_table_name("admin_ranks")]
SET exclude_flags = :exclude_flags
WHERE rank = :rank_name
WHERE `rank` = :rank_name
"}, list("rank_name" = admin_rank, "exclude_flags" = new_flags))
if("Editing Rights")
query_update_rank = SSdbcore.NewQuery({"
UPDATE [format_table_name("admin_ranks")]
SET can_edit_flags = :can_edit_flags
WHERE rank = :rank_name
WHERE `rank` = :rank_name
"}, list("rank_name" = admin_rank, "can_edit_flags" = new_flags))
if(!query_update_rank.warn_execute())