Skip to content

[TM ONLY] Possible fix for some sql stuff #37

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

Closed
FalloutFalcon wants to merge 3 commits into from
Closed

[TM ONLY] Possible fix for some sql stuff #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcc5a41
yea
FalloutFalcon Apr 10, 2026
8a593df
yea
FalloutFalcon Apr 10, 2026
d491559
Merge branch 'master' into see-about-a-perms-fix
dwinters99 Apr 18, 2026
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
4 changes: 2 additions & 2 deletions code/modules/admin/admin_ranks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,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())
Expand All @@ -364,7 +364,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())
Expand Down
12 changes: 6 additions & 6 deletions code/modules/admin/permissionedit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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())
Expand Down
Loading