Core/Database: Remove va_args from DatabaseWorker::Execute methods.

* Also delegate SQLQueryHolder::SetPQuery into SetQuery.

(cherry picked from commit df4723af25900b3638a2b5921cf67e1838cbaf64)

Conflicts:
	src/server/shared/Database/QueryHolder.h

1 files changed, 3 insertions, 2 deletions

diff --git a/src/server/shared/Database/QueryHolder.h b/src/server/shared/Database/QueryHolder.h
index 9022b97de3b..a190ffbbdab 100644
--- a/src/server/shared/Database/QueryHolder.h
+++ b/src/server/shared/Database/QueryHolder.h
@@ -29,8 +29,9 @@ class SQLQueryHolder
     public:
         SQLQueryHolder() { }
         virtual ~SQLQueryHolder();
-        bool SetQuery(size_t index, const char *sql);
-        bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3, 4);
+        bool SetQuery(size_t index, const char* sql);
+        template<typename... Args>
+        bool SetPQuery(size_t index, const char* sql, Args const&... args) { return SetQuery(index, Trinity::StringFormat(sql, args...).c_str()); }
         bool SetPreparedQuery(size_t index, PreparedStatement* stmt);
         void SetSize(size_t size);
         QueryResult GetResult(size_t index);