From: Kim Alvefur <zash@zash.se>
Date: Sun, 13 Mar 2016 16:38:49 +0000 (+0100)
Subject: util.sql: Move per-driver (currenly only PostgreSQL) query transform into its own... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3e9b779e8d5dcbded45121cf745852d96c153a37;p=prosody.git

util.sql: Move per-driver (currenly only PostgreSQL) query transform into its own method
---

diff --git a/util/sql.lua b/util/sql.lua
index 9981ac3c..85664567 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -124,6 +124,14 @@ end
 function engine:onconnect()
 	-- Override from create_engine()
 end
+
+function engine:prepquery(sql)
+	if self.params.driver == "PostgreSQL" then
+		sql = sql:gsub("`", "\"");
+	end
+	return sql;
+end
+
 function engine:execute(sql, ...)
 	local success, err = self:connect();
 	if not success then return success, err; end
@@ -153,17 +161,13 @@ local function debugquery(where, sql, ...)
 end
 
 function engine:execute_query(sql, ...)
-	if self.params.driver == "PostgreSQL" then
-		sql = sql:gsub("`", "\"");
-	end
+	sql = self:prepquery(sql);
 	local stmt = assert(self.conn:prepare(sql));
 	assert(stmt:execute(...));
 	return stmt:rows();
 end
 function engine:execute_update(sql, ...)
-	if self.params.driver == "PostgreSQL" then
-		sql = sql:gsub("`", "\"");
-	end
+	sql = self:prepquery(sql);
 	local prepared = self.prepared;
 	local stmt = prepared[sql];
 	if not stmt then