mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-09 08:51:57 +00:00
Better SQL prepared statements (#2474)
The system used to be of complexity O(n^2). Essentially two for loops running per every argument. Which ended up being surprisingly slow (there were instances where I saw the argument parser as using quite a lot of CPU time).
This replaces it with a more linear algorithm. It's somewhere near O(n) where n is the length of the unparsed query. Which is more stable and faaaster. This comes with two changes, however:
Parameters inside the query now have to be delimited from both sides with : (colons). The alternative to this would be to use something like $n or just assume that space marks the end of a marker. Only the former is workable, the latter would break a few queries already.
Arguments in the argument array no longer have to be prefixed by : (colons). So, while in the query you would write :thing:, you'd initialize the array of args as: list("thing" = somevar). It could be made to work without it, but eh, I think this is fine.
Argument validation is slightly weaker. What I mean by this is that with the old system, unused keys would result in an error. This is no longer a thing. Missing keys will still result in an error, however.
One more improvement: double delimiting removes an edge case where if key A partially covers key B, depending on the order, key A would mangle key B.
Updated and tested all queries that I could find. So this should be good.
This commit is contained in:
@@ -415,8 +415,8 @@ datum/preferences
|
||||
if(!dbcon.IsConnected())
|
||||
return open_load_dialog_file(user)
|
||||
|
||||
var/DBQuery/query = dbcon.NewQuery("SELECT id, name FROM ss13_characters WHERE ckey = :ckey AND deleted_at IS NULL ORDER BY id ASC")
|
||||
query.Execute(list(":ckey" = user.client.ckey))
|
||||
var/DBQuery/query = dbcon.NewQuery("SELECT id, name FROM ss13_characters WHERE ckey = :ckey: AND deleted_at IS NULL ORDER BY id ASC")
|
||||
query.Execute(list("ckey" = user.client.ckey))
|
||||
|
||||
dat += "<b>Select a character slot to load</b><hr>"
|
||||
var/name
|
||||
@@ -471,8 +471,8 @@ datum/preferences
|
||||
if (!config.sql_saves || !config.sql_stats || !establish_db_connection(dbcon) || !H)
|
||||
return
|
||||
|
||||
var/DBQuery/query = dbcon.NewQuery("INSERT INTO ss13_characters_log (char_id, game_id, datetime, job_name, special_role) VALUES (:char_id, :game_id, NOW(), :job, :special_role)")
|
||||
query.Execute(list(":char_id" = current_character, ":game_id" = game_id, ":job" = H.mind.assigned_role, ":special_role" = H.mind.special_role))
|
||||
var/DBQuery/query = dbcon.NewQuery("INSERT INTO ss13_characters_log (char_id, game_id, datetime, job_name, special_role) VALUES (:char_id:, :game_id:, NOW(), :job:, :special_role:)")
|
||||
query.Execute(list("char_id" = current_character, "game_id" = game_id, "job" = H.mind.assigned_role, "special_role" = H.mind.special_role))
|
||||
|
||||
// Turned into a proc so we could reuse it for SQL shenanigans.
|
||||
/datum/preferences/proc/new_setup(var/re_initialize = 0)
|
||||
@@ -570,8 +570,8 @@ datum/preferences
|
||||
C << "<span class='notice'>Unable to establish database connection.</span>"
|
||||
return
|
||||
|
||||
var/DBQuery/query = dbcon.NewQuery("UPDATE ss13_characters SET deleted_at = NOW() WHERE id = :char_id")
|
||||
query.Execute(list(":char_id" = current_character))
|
||||
var/DBQuery/query = dbcon.NewQuery("UPDATE ss13_characters SET deleted_at = NOW() WHERE id = :char_id:")
|
||||
query.Execute(list("char_id" = current_character))
|
||||
|
||||
// Create a new character.
|
||||
new_setup(1)
|
||||
|
||||
Reference in New Issue
Block a user