Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

[user/henk/code/inspircd.git] / src / modules / extra / m_pgsql.cpp

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index fb282fb98a5e35e3ae6d66d2e7e2fa5223c4a2a8..be8598e02c7c8f83369d0b5261b57e5fdb0ff225 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -83,9 +83,9 @@ std::string SQLhost::GetDSN()
 
 class ReconnectTimer : public Timer
 {
-  private:
+ private:
        Module* mod;
-  public:
+ public:
        ReconnectTimer(InspIRCd* SI, Module* m)
        : Timer(5, SI->Time(), false), mod(m)
        {
@@ -314,8 +314,8 @@ public:
  */
 class SQLConn : public EventHandler
 {
-  private:
-       InspIRCd*               Instance;
+ private:
+       InspIRCd*               Instance;
        SQLhost                 confhost;       /* The <database> entry */
        Module*                 us;                     /* Pointer to the SQL provider itself */
        PGconn*                 sql;            /* PgSQL database connection handle */
@@ -324,7 +324,7 @@ class SQLConn : public EventHandler
        QueryQueue              queue;          /* Queue of queries waiting to be executed on this connection */
        time_t                  idle;           /* Time we last heard from the database */
 
-  public:
+ public:
        SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi)
        : EventHandler(), Instance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false)
        {
@@ -468,7 +468,7 @@ class SQLConn : public EventHandler
                                                case PGRES_EMPTY_QUERY:
                                                case PGRES_BAD_RESPONSE:
                                                case PGRES_FATAL_ERROR:
-                                                       reply.error.Id(QREPLY_FAIL);
+                                                       reply.error.Id(SQL_QREPLY_FAIL);
                                                        reply.error.Str(PQresultErrorMessage(result));
                                                default:;
                                                        /* No action, other values are not errors */
@@ -656,11 +656,11 @@ class SQLConn : public EventHandler
                                else
                                {
                                        delete[] query;
-                                       return SQLerror(QSEND_FAIL, PQerrorMessage(sql));
+                                       return SQLerror(SQL_QSEND_FAIL, PQerrorMessage(sql));
                                }
                        }
                }
-               return SQLerror(BAD_CONN, "Can't query until connection is complete");
+               return SQLerror(SQL_BAD_CONN, "Can't query until connection is complete");
        }
 
        SQLerror Query(const SQLrequest &req)
@@ -713,15 +713,15 @@ class SQLConn : public EventHandler
 
 class ModulePgSQL : public Module
 {
-  private:
+ private:
        ConnMap connections;
        unsigned long currid;
        char* sqlsuccess;
        ReconnectTimer* retimer;
 
-  public:
+ public:
        ModulePgSQL(InspIRCd* Me)
-       : Module::Module(Me), currid(0)
+       : Module(Me), currid(0)
        {
                ServerInstance->Modules->UseInterface("SQLutils");
 
@@ -919,11 +919,11 @@ class ModulePgSQL : public Module
                                req->id = NewID();
                                req->error = iter->second->Query(*req);
 
-                               return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL;
+                               return (req->error.Id() == SQL_NO_ERROR) ? sqlsuccess : NULL;
                        }
                        else
                        {
-                               req->error.Id(BAD_DBID);
+                               req->error.Id(SQL_BAD_DBID);
                                return NULL;
                        }
                }
@@ -954,7 +954,7 @@ class ModulePgSQL : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+               return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
        }
 };