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 6b8638b7b973c4b10e6fa30a0f48601a66e532df..be8598e02c7c8f83369d0b5261b57e5fdb0ff225 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -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)
@@ -721,7 +721,7 @@ class ModulePgSQL : public Module
 
  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;
                        }
                }