X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=37cf9270455c48c8accf38c1859c0393453b1ed6;hb=2d35c3396a1f00375d45b874dafb9e0bdb520a9b;hp=7aaf96a67fea99ee6980f68ff91f9112c821c121;hpb=91e0af0fc4889f20d2f63426f8fe379674fc0393;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 7aaf96a67..37cf92704 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -24,6 +24,7 @@
 /// $CompilerFlags: -Iexecute("pg_config --includedir" "POSTGRESQL_INCLUDE_DIR")
 /// $LinkerFlags: -Lexecute("pg_config --libdir" "POSTGRESQL_LIBRARY_DIR") -lpq
 
+/// $PackageInfo: require_system("arch") postgresql-libs
 /// $PackageInfo: require_system("centos") postgresql-devel
 /// $PackageInfo: require_system("darwin") postgresql
 /// $PackageInfo: require_system("debian") libpq-dev
@@ -70,9 +71,9 @@ class ReconnectTimer : public Timer
 
 struct QueueItem
 {
-	SQLQuery* c;
+	SQL::Query* c;
 	std::string q;
-	QueueItem(SQLQuery* C, const std::string& Q) : c(C), q(Q) {}
+	QueueItem(SQL::Query* C, const std::string& Q) : c(C), q(Q) {}
 };
 
 /** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult.
@@ -82,17 +83,27 @@ struct QueueItem
  * data is passes to the module nearly as directly as if it was using the API directly itself.
  */
 
-class PgSQLresult : public SQLResult
+class PgSQLresult : public SQL::Result
 {
 	PGresult* res;
 	int currentrow;
 	int rows;
+	std::vector<std::string> colnames;
+
+	void getColNames()
+	{
+		colnames.resize(PQnfields(res));
+		for(unsigned int i=0; i < colnames.size(); i++)
+		{
+			colnames[i] = PQfname(res, i);
+		}
+	}
  public:
 	PgSQLresult(PGresult* result) : res(result), currentrow(0)
 	{
 		rows = PQntuples(res);
 		if (!rows)
-			rows = atoi(PQcmdTuples(res));
+			rows = ConvToNum<int>(PQcmdTuples(res));
 	}
 
 	~PgSQLresult()
@@ -107,23 +118,37 @@ class PgSQLresult : public SQLResult
 
 	void GetCols(std::vector<std::string>& result) CXX11_OVERRIDE
 	{
-		result.resize(PQnfields(res));
-		for(unsigned int i=0; i < result.size(); i++)
+		if (colnames.empty())
+			getColNames();
+		result = colnames;
+	}
+
+	bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE
+	{
+		if (colnames.empty())
+			getColNames();
+
+		for (size_t i = 0; i < colnames.size(); ++i)
 		{
-			result[i] = PQfname(res, i);
+			if (colnames[i] == column)
+			{
+				index = i;
+				return true;
+			}
 		}
+		return false;
 	}
 
-	SQLEntry GetValue(int row, int column)
+	SQL::Field GetValue(int row, int column)
 	{
 		char* v = PQgetvalue(res, row, column);
 		if (!v || PQgetisnull(res, row, column))
-			return SQLEntry();
+			return SQL::Field();
 
-		return SQLEntry(std::string(v, PQgetlength(res, row, column)));
+		return SQL::Field(std::string(v, PQgetlength(res, row, column)));
 	}
 
-	bool GetRow(SQLEntries& result) CXX11_OVERRIDE
+	bool GetRow(SQL::Row& result) CXX11_OVERRIDE
 	{
 		if (currentrow >= PQntuples(res))
 			return false;
@@ -141,7 +166,7 @@ class PgSQLresult : public SQLResult
 
 /** SQLConn represents one SQL session.
  */
-class SQLConn : public SQLProvider, public EventHandler
+class SQLConn : public SQL::Provider, public EventHandler
 {
  public:
 	reference<ConfigTag> conf;	/* The <database> entry */
@@ -151,7 +176,7 @@ class SQLConn : public SQLProvider, public EventHandler
 	QueueItem		qinprog;	/* If there is currently a query in progress */
 
 	SQLConn(Module* Creator, ConfigTag* tag)
-	: SQLProvider(Creator, "SQL/" + tag->getString("id")), conf(tag), sql(NULL), status(CWRITE), qinprog(NULL, "")
+	: SQL::Provider(Creator, "SQL/" + tag->getString("id")), conf(tag), sql(NULL), status(CWRITE), qinprog(NULL, "")
 	{
 		if (!DoConnect())
 		{
@@ -162,14 +187,14 @@ class SQLConn : public SQLProvider, public EventHandler
 
 	CullResult cull() CXX11_OVERRIDE
 	{
-		this->SQLProvider::cull();
+		this->SQL::Provider::cull();
 		ServerInstance->Modules->DelService(*this);
 		return this->EventHandler::cull();
 	}
 
 	~SQLConn()
 	{
-		SQLerror err(SQL_BAD_DBID);
+		SQL::Error err(SQL::BAD_DBID);
 		if (qinprog.c)
 		{
 			qinprog.c->OnError(err);
@@ -177,7 +202,7 @@ class SQLConn : public SQLProvider, public EventHandler
 		}
 		for(std::deque<QueueItem>::iterator i = queue.begin(); i != queue.end(); i++)
 		{
-			SQLQuery* q = i->c;
+			SQL::Query* q = i->c;
 			q->OnError(err);
 			delete q;
 		}
@@ -274,6 +299,7 @@ class SQLConn : public SQLProvider, public EventHandler
 				SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 				status = WWRITE;
 				DoConnectedPoll();
+				return true;
 			default:
 				return true;
 		}
@@ -320,7 +346,7 @@ restart:
 					case PGRES_BAD_RESPONSE:
 					case PGRES_FATAL_ERROR:
 					{
-						SQLerror err(SQL_QREPLY_FAIL, PQresultErrorMessage(result));
+						SQL::Error err(SQL::QREPLY_FAIL, PQresultErrorMessage(result));
 						qinprog.c->OnError(err);
 						break;
 					}
@@ -367,6 +393,7 @@ restart:
 				SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 				status = WWRITE;
 				DoConnectedPoll();
+				return true;
 			default:
 				return true;
 		}
@@ -390,8 +417,9 @@ restart:
 		}
 	}
 
-	void submit(SQLQuery *req, const std::string& q) CXX11_OVERRIDE
+	void Submit(SQL::Query *req, const std::string& q) CXX11_OVERRIDE
 	{
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Executing PostgreSQL query: " + q);
 		if (qinprog.q.empty())
 		{
 			DoQuery(QueueItem(req,q));
@@ -403,7 +431,7 @@ restart:
 		}
 	}
 
-	void submit(SQLQuery *req, const std::string& q, const ParamL& p) CXX11_OVERRIDE
+	void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE
 	{
 		std::string res;
 		unsigned int param = 0;
@@ -425,10 +453,10 @@ restart:
 				}
 			}
 		}
-		submit(req, res);
+		Submit(req, res);
 	}
 
-	void submit(SQLQuery *req, const std::string& q, const ParamM& p) CXX11_OVERRIDE
+	void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE
 	{
 		std::string res;
 		for(std::string::size_type i = 0; i < q.length(); i++)
@@ -443,7 +471,7 @@ restart:
 					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;
@@ -456,7 +484,7 @@ restart:
 				}
 			}
 		}
-		submit(req, res);
+		Submit(req, res);
 	}
 
 	void DoQuery(const QueueItem& req)
@@ -464,7 +492,7 @@ restart:
 		if (status != WREAD && status != WWRITE)
 		{
 			// whoops, not connected...
-			SQLerror err(SQL_BAD_CONN);
+			SQL::Error err(SQL::BAD_CONN);
 			req.c->OnError(err);
 			delete req.c;
 			return;
@@ -476,7 +504,7 @@ restart:
 		}
 		else
 		{
-			SQLerror err(SQL_QSEND_FAIL, PQerrorMessage(sql));
+			SQL::Error err(SQL::QSEND_FAIL, PQerrorMessage(sql));
 			req.c->OnError(err);
 			delete req.c;
 		}
@@ -522,7 +550,7 @@ class ModulePgSQL : public Module
 		ConfigTagList tags = ServerInstance->Config->ConfTags("database");
 		for(ConfigIter i = tags.first; i != tags.second; i++)
 		{
-			if (i->second->getString("module", "pgsql") != "pgsql")
+			if (!stdalgo::string::equalsci(i->second->getString("module"), "pgsql"))
 				continue;
 			std::string id = i->second->getString("id");
 			ConnMap::iterator curr = connections.find(id);
@@ -554,7 +582,7 @@ class ModulePgSQL : public Module
 
 	void OnUnloadModule(Module* mod) CXX11_OVERRIDE
 	{
-		SQLerror err(SQL_BAD_DBID);
+		SQL::Error err(SQL::BAD_DBID);
 		for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
 		{
 			SQLConn* conn = i->second;
@@ -567,7 +595,7 @@ class ModulePgSQL : public Module
 			std::deque<QueueItem>::iterator j = conn->queue.begin();
 			while (j != conn->queue.end())
 			{
-				SQLQuery* q = j->c;
+				SQL::Query* q = j->c;
 				if (q->creator == mod)
 				{
 					q->OnError(err);