pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 08:53:12 +02:00
Code Activity

Modified the SQL API to allow unescaped parameters (useful for passing row names and NULL values)

Browse Source
This commit is contained in:
DukePyrolator
2012-04-08 12:30:48 +02:00
parent 9d249ef96f
commit 9e1fda2a44
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/extra/m_mysql.cpp
+2 -2
View File
@@ -423,8 +423,8 @@ Anope::string MySQLService::BuildQuery(const SQLQuery &q)
{
Anope::string real_query = q.query;
for (std::map<Anope::string, Anope::string>::const_iterator it = q.parameters.begin(), it_end = q.parameters.end(); it != it_end; ++it)
real_query = real_query.replace_all_cs("@" + it->first + "@", "'" + this->Escape(it->second) + "'");
for (std::map<Anope::string, QueryData>::const_iterator it = q.parameters.begin(), it_end = q.parameters.end(); it != it_end; ++it)
real_query = real_query.replace_all_cs("@" + it->first + "@", (it->second.escape ? ("'" + this->Escape(it->second.data) + "'") : it->second.data));
return real_query;
}
modules/extra/sql.h
+11 -3
View File
@@ -11,10 +11,17 @@ class SQLException : public ModuleException
/** A SQL query
*/
struct QueryData
{
Anope::string data;
bool escape;
};
struct SQLQuery
{
Anope::string query;
std::map<Anope::string, Anope::string> parameters;
std::map<Anope::string, QueryData> parameters;
SQLQuery() { }
SQLQuery(const Anope::string &q) : query(q) { }
@@ -36,12 +43,13 @@ struct SQLQuery
return !(*this == other);
}
template<typename T> void setValue(const Anope::string &key, const T& value)
template<typename T> void setValue(const Anope::string &key, const T& value, bool escape = true)
{
try
{
Anope::string string_value = stringify(value);
this->parameters[key] = string_value;
this->parameters[key].data = string_value;
this->parameters[key].escape = escape;
}
catch (const ConvertException &ex) { }
}