summaryrefslogtreecommitdiff
path: root/src/modules/extra
diff options
context:
space:
mode:
authorspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-06-28 15:17:05 +0000
committerspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-06-28 15:17:05 +0000
commitb28e63cdf3eb192a7ebbcfaf71d7d29312a6c9de (patch)
treeae489f9501bf40bc3b56b6d54bb55c04c3765372 /src/modules/extra
parentb254d3d034d5e16326404d253c8574bea9b711d4 (diff)
Added SQLQuery::GetError() and removed a lot of space indenting
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4078 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_sql.h144
1 files changed, 75 insertions, 69 deletions
diff --git a/src/modules/extra/m_sql.h b/src/modules/extra/m_sql.h
index 519b28f33..2fa61fbe9 100644
--- a/src/modules/extra/m_sql.h
+++ b/src/modules/extra/m_sql.h
@@ -120,24 +120,24 @@ class SQLResult
class SQLQuery
{
- private:
- SQLRequest* rowrequest;
+ private:
+ SQLRequest* rowrequest;
SQLRequest* query;
SQLResult* result;
SQLResult* rowresult;
- Request* rowquery;
- unsigned long dbid;
- Module* parent;
- Module* SQLModule;
- Server* Srv;
-
+ Request* rowquery;
+ unsigned long dbid;
+ Module* parent;
+ Module* SQLModule;
+ Server* Srv;
+ std::string error;
- bool MakeQueryGoNow(std::string qry)
+ bool MakeQueryGoNow(std::string qry)
{
- // Insert Lack of More Original Name here.
- Request queryrequest((char*)query, parent, SQLModule);
- result = (SQLResult*)queryrequest.Send();
- if (result->GetType() != SQL_ERROR)
+ // Insert Lack of More Original Name here.
+ Request queryrequest((char*)query, parent, SQLModule);
+ result = (SQLResult*)queryrequest.Send();
+ if (result->GetType() != SQL_ERROR)
{
// Query Is fine.. Prepare to get first row...
rowrequest = new SQLRequest(SQL_ROW,dbid,"");
@@ -148,7 +148,8 @@ class SQLQuery
Srv->Log(DEBUG, " ============= SQL Error, Query And Error Follow. ============= ");
Srv->Log(DEBUG, "Query: "+ qry);
Srv->Log(DEBUG, "Error: "+ result->GetError());
- Srv->Log(DEBUG, " ============================================================== ");
+ Srv->Log(DEBUG, " ============================================================== ");
+ error = result->GetError();
// Destroy Variables that were set..
delete query;
query = NULL;
@@ -156,44 +157,44 @@ class SQLQuery
return false;
}
- public:
+ public:
SQLQuery(Server* S) : Srv(S)
{
}
- SQLQuery(Module* a, unsigned long b, Server* S) : dbid(b), parent(a), Srv(S)
- {
- // Make a few useful variables..
- SQLModule = Srv->FindModule("m_sql.so");
- }
-
- ~SQLQuery()
- {
- }
-
- bool Query(std::string qry)
- {
- query = new SQLRequest(SQL_RESULT, dbid, qry);
- return MakeQueryGoNow(qry);
- }
-
- bool QueryCount(std::string qry)
- {
- query = new SQLRequest(SQL_COUNT, dbid, qry);
- return MakeQueryGoNow(qry);
- }
-
- bool GetRow()
- {
+ SQLQuery(Module* a, unsigned long b, Server* S) : dbid(b), parent(a), Srv(S)
+ {
+ // Make a few useful variables..
+ SQLModule = Srv->FindModule("m_sql.so");
+ }
+
+ ~SQLQuery()
+ {
+ }
+
+ bool Query(std::string qry)
+ {
+ query = new SQLRequest(SQL_RESULT, dbid, qry);
+ return MakeQueryGoNow(qry);
+ }
+
+ bool QueryCount(std::string qry)
+ {
+ query = new SQLRequest(SQL_COUNT, dbid, qry);
+ return MakeQueryGoNow(qry);
+ }
+
+ bool GetRow()
+ {
rowresult = (SQLResult*)rowquery->Send();
if (rowresult->GetType() == SQL_ROW)
{
- // We have got a row.. thats all for now.
- return true;
- }
- // No Row, Error, or end. KILL CALLER! *BANG*
- return false;
+ // We have got a row.. thats all for now.
+ return true;
+ }
+ // No Row, Error, or end. KILL CALLER! *BANG*
+ return false;
}
std::string GetField(std::string fname)
@@ -204,36 +205,41 @@ class SQLQuery
long GetCount()
{
rowresult = (SQLResult*)rowquery->Send();
- if (rowresult->GetType() == SQL_COUNT)
+ if (rowresult->GetType() == SQL_COUNT)
{
- return rowresult->GetCount();
- }
+ return rowresult->GetCount();
+ }
else
{
- return 0;
- }
- }
+ return 0;
+ }
+ }
+
+ const std::string &GetError()
+ {
+ return error;
+ }
- void SQLDone()
+ void SQLDone()
{
- // Tell m_sql we are finished..
+ // Tell m_sql we are finished..
query->SetQueryType(SQL_DONE);
- query->SetConnID(dbid);
- Request donerequest((char*)query, parent, SQLModule);
- donerequest.Send();
-
- // Do Some Clearing up.
- delete query;
- delete rowrequest;
- // Null the variables, so they can be re-used without confusion..
- result = NULL;
- query = NULL;
- rowrequest = NULL;
- rowresult = NULL;
- }
-
- static std::string Sanitise(const std::string& crap)
- {
+ query->SetConnID(dbid);
+ Request donerequest((char*)query, parent, SQLModule);
+ donerequest.Send();
+
+ // Do Some Clearing up.
+ delete query;
+ delete rowrequest;
+ // Null the variables, so they can be re-used without confusion..
+ result = NULL;
+ query = NULL;
+ rowrequest = NULL;
+ rowresult = NULL;
+ }
+
+ static std::string Sanitise(const std::string& crap)
+ {
std::string temp = "";
for (unsigned int q = 0; q < crap.length(); q++)
{
@@ -255,7 +261,7 @@ class SQLQuery
}
}
return temp;
- }
+ }
};