X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=41c3a2a65a63e2dcb994ac4634b8b30d40d0b720;hb=71c367f89f5384eb05cf191f63ed5094e90b46ad;hp=3490f7fa60f66291d0a8d19ba4faf5ee2bfbe234;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 3490f7fa6..41c3a2a65 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -84,17 +84,17 @@ class DispatcherThread;
 
 struct QQueueItem
 {
-	SQLQuery* q;
+	SQL::Query* q;
 	std::string query;
 	SQLConnection* c;
-	QQueueItem(SQLQuery* Q, const std::string& S, SQLConnection* C) : q(Q), query(S), c(C) {}
+	QQueueItem(SQL::Query* Q, const std::string& S, SQLConnection* C) : q(Q), query(S), c(C) {}
 };
 
 struct RQueueItem
 {
-	SQLQuery* q;
+	SQL::Query* q;
 	MySQLresult* r;
-	RQueueItem(SQLQuery* Q, MySQLresult* R) : q(Q), r(R) {}
+	RQueueItem(SQL::Query* Q, MySQLresult* R) : q(Q), r(R) {}
 };
 
 typedef insp::flat_map<std::string, SQLConnection*> ConnMap;
@@ -126,8 +126,8 @@ class DispatcherThread : public SocketThread
  public:
 	DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { }
 	~DispatcherThread() { }
-	void Run();
-	void OnNotify();
+	void Run() CXX11_OVERRIDE;
+	void OnNotify() CXX11_OVERRIDE;
 };
 
 #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224
@@ -136,16 +136,16 @@ class DispatcherThread : public SocketThread
 
 /** Represents a mysql result set
  */
-class MySQLresult : public SQLResult
+class MySQLresult : public SQL::Result
 {
  public:
-	SQLerror err;
+	SQL::Error err;
 	int currentrow;
 	int rows;
 	std::vector<std::string> colnames;
-	std::vector<SQLEntries> fieldlists;
+	std::vector<SQL::Row> fieldlists;
 
-	MySQLresult(MYSQL_RES* res, int affected_rows) : err(SQL_NO_ERROR), currentrow(0), rows(0)
+	MySQLresult(MYSQL_RES* res, int affected_rows) : err(SQL::SUCCESS), currentrow(0), rows(0)
 	{
 		if (affected_rows >= 1)
 		{
@@ -174,9 +174,9 @@ class MySQLresult : public SQLResult
 					{
 						std::string a = (fields[field_count].name ? fields[field_count].name : "");
 						if (row[field_count])
-							fieldlists[n].push_back(SQLEntry(row[field_count]));
+							fieldlists[n].push_back(SQL::Field(row[field_count]));
 						else
-							fieldlists[n].push_back(SQLEntry());
+							fieldlists[n].push_back(SQL::Field());
 						colnames.push_back(a);
 						field_count++;
 					}
@@ -188,31 +188,44 @@ class MySQLresult : public SQLResult
 		}
 	}
 
-	MySQLresult(SQLerror& e) : err(e)
+	MySQLresult(SQL::Error& e) : err(e)
 	{
 
 	}
 
-	int Rows()
+	int Rows() CXX11_OVERRIDE
 	{
 		return rows;
 	}
 
-	void GetCols(std::vector<std::string>& result)
+	void GetCols(std::vector<std::string>& result) CXX11_OVERRIDE
 	{
 		result.assign(colnames.begin(), colnames.end());
 	}
 
-	SQLEntry GetValue(int row, int column)
+	bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE
+	{
+		for (size_t i = 0; i < colnames.size(); ++i)
+		{
+			if (colnames[i] == column)
+			{
+				index = i;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	SQL::Field GetValue(int row, int column)
 	{
 		if ((row >= 0) && (row < rows) && (column >= 0) && (column < (int)fieldlists[row].size()))
 		{
 			return fieldlists[row][column];
 		}
-		return SQLEntry();
+		return SQL::Field();
 	}
 
-	bool GetRow(SQLEntries& result)
+	bool GetRow(SQL::Row& result) CXX11_OVERRIDE
 	{
 		if (currentrow < rows)
 		{
@@ -230,7 +243,7 @@ class MySQLresult : public SQLResult
 
 /** Represents a connection to a mysql database
  */
-class SQLConnection : public SQLProvider
+class SQLConnection : public SQL::Provider
 {
  public:
 	reference<ConfigTag> config;
@@ -238,7 +251,7 @@ class SQLConnection : public SQLProvider
 	Mutex lock;
 
 	// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
-	SQLConnection(Module* p, ConfigTag* tag) : SQLProvider(p, "SQL/" + tag->getString("id")),
+	SQLConnection(Module* p, ConfigTag* tag) : SQL::Provider(p, "SQL/" + tag->getString("id")),
 		config(tag), connection(NULL)
 	{
 	}
@@ -259,7 +272,7 @@ class SQLConnection : public SQLProvider
 		std::string user = config->getString("user");
 		std::string pass = config->getString("pass");
 		std::string dbname = config->getString("name");
-		int port = config->getInt("port");
+		unsigned int port = config->getUInt("port", 3306);
 		bool rv = mysql_real_connect(connection, host.c_str(), user.c_str(), pass.c_str(), dbname.c_str(), port, NULL, 0);
 		if (!rv)
 			return rv;
@@ -297,7 +310,7 @@ class SQLConnection : public SQLProvider
 		{
 			/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
 			 * possible error numbers and error messages */
-			SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + ": " + mysql_error(connection));
+			SQL::Error e(SQL::QREPLY_FAIL, InspIRCd::Format("%u: %s", mysql_errno(connection), mysql_error(connection)));
 			return new MySQLresult(e);
 		}
 	}
@@ -319,14 +332,14 @@ class SQLConnection : public SQLProvider
 		mysql_close(connection);
 	}
 
-	void submit(SQLQuery* q, const std::string& qs)
+	void Submit(SQL::Query* q, const std::string& qs) CXX11_OVERRIDE
 	{
 		Parent()->Dispatcher->LockQueue();
 		Parent()->qq.push_back(QQueueItem(q, qs, this));
 		Parent()->Dispatcher->UnlockQueueWakeup();
 	}
 
-	void submit(SQLQuery* call, const std::string& q, const ParamL& p)
+	void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE
 	{
 		std::string res;
 		unsigned int param = 0;
@@ -343,18 +356,17 @@ class SQLConnection : public SQLProvider
 					// and one byte is the terminating null
 					std::vector<char> buffer(parm.length() * 2 + 1);
 
-					// The return value of mysql_escape_string() is the length of the encoded string,
+					// The return value of mysql_real_escape_string() is the length of the encoded string,
 					// not including the terminating null
-					unsigned long escapedsize = mysql_escape_string(&buffer[0], parm.c_str(), parm.length());
-//					mysql_real_escape_string(connection, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length());
+					unsigned long escapedsize = mysql_real_escape_string(connection, &buffer[0], parm.c_str(), parm.length());
 					res.append(&buffer[0], escapedsize);
 				}
 			}
 		}
-		submit(call, res);
+		Submit(call, res);
 	}
 
-	void submit(SQLQuery* call, const std::string& q, const ParamM& p)
+	void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE
 	{
 		std::string res;
 		for(std::string::size_type i = 0; i < q.length(); i++)
@@ -369,7 +381,7 @@ class SQLConnection : public SQLProvider
 					field.push_back(q[i++]);
 				i--;
 
-				ParamM::const_iterator it = p.find(field);
+				SQL::ParamMap::const_iterator it = p.find(field);
 				if (it != p.end())
 				{
 					std::string parm = it->second;
@@ -380,7 +392,7 @@ class SQLConnection : public SQLProvider
 				}
 			}
 		}
-		submit(call, res);
+		Submit(call, res);
 	}
 };
 
@@ -415,7 +427,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status)
 	ConfigTagList tags = ServerInstance->Config->ConfTags("database");
 	for(ConfigIter i = tags.first; i != tags.second; i++)
 	{
-		if (i->second->getString("module", "mysql") != "mysql")
+		if (!stdalgo::string::equalsci(i->second->getString("provider"), "mysql"))
 			continue;
 		std::string id = i->second->getString("id");
 		ConnMap::iterator curr = connections.find(id);
@@ -434,7 +446,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status)
 
 	// now clean up the deleted databases
 	Dispatcher->LockQueue();
-	SQLerror err(SQL_BAD_DBID);
+	SQL::Error err(SQL::BAD_DBID);
 	for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
 	{
 		ServerInstance->Modules->DelService(*i->second);
@@ -461,7 +473,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status)
 
 void ModuleSQL::OnUnloadModule(Module* mod)
 {
-	SQLerror err(SQL_BAD_DBID);
+	SQL::Error err(SQL::BAD_DBID);
 	Dispatcher->LockQueue();
 	unsigned int i = qq.size();
 	while (i > 0)
@@ -541,7 +553,7 @@ void DispatcherThread::OnNotify()
 	for(ResultQueue::iterator i = Parent->rq.begin(); i != Parent->rq.end(); i++)
 	{
 		MySQLresult* res = i->r;
-		if (res->err.id == SQL_NO_ERROR)
+		if (res->err.code == SQL::SUCCESS)
 			i->q->OnResult(*res);
 		else
 			i->q->OnError(res->err);