From 7f0c82b0ba3cf3477092a266ec8b37d0b6dc9ec4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 3 Jul 2018 11:14:00 -0500 Subject: [PATCH] [MIRROR] SDQL where filter message is now correct (#7309) * Merge pull request #38853 from optimumtact/seequeuedeeall SDQL where filter message is now correct * SDQL where filter message is now correct --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index a19ab3c100..54af4b5167 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -54,6 +54,7 @@ return var/list/refs = list() + var/where_used = FALSE for(var/list/query_tree in querys) var/list/from_objs = list() var/list/select_types = list() @@ -82,6 +83,7 @@ objs_all = objs.len if("where" in query_tree) + where_used = TRUE var/objs_temp = objs objs = list() for(var/datum/d in objs_temp) @@ -119,7 +121,7 @@ var/end_time = REALTIMEOFDAY end_time -= start_time return list("SDQL query results: [query_text]",\ - "SDQL query completed: [objs_all] objects selected by path, and [objs_eligible] objects executed on after WHERE filtering if applicable.",\ + "SDQL query completed: [objs_all] objects selected by path, and [where_used ? objs_eligible : objs_all] objects executed on after WHERE filtering if applicable.",\ "SDQL query took [DisplayTimeText(end_time)] to complete.") + refs /proc/SDQL_qdel_datum(datum/d)