Merge pull request #1 from meeb/meeb

[irc/quakenet/newserv.git] / dbapi / dbapi.h

diff --git a/dbapi/dbapi.h b/dbapi/dbapi.h
index 07d888b91c83d52bd2844cb41fdd0681e250f76c..990c43c8c8f21ac9127b6560039889139484fa01 100644 (file)
--- a/dbapi/dbapi.h
+++ b/dbapi/dbapi.h
@@ -7,6 +7,7 @@
 
 #define DB_NULLIDENTIFIER 0
 #define DB_CREATE 1
+#define DB_CALL 2
 
 #ifdef DBAPI_OVERRIDE
 #undef USE_DBAPI_PGSQL
@@ -38,11 +39,13 @@ typedef PQResult DBResult;
 #define dbquerysuccessful(x) pqquerysuccessful(x)
 #define dbgetresult(conn) pqgetresult(conn)
 #define dbnumfields(x) PQnfields(x->result)
+#define dbnumaffected(c, x) strtoul(PQcmdTuples(x->result), NULL, 10)
 
 #define dbfetchrow(result) pqfetchrow(result)
 #define dbgetvalue(result, column) pqgetvalue(result, column)
 
 #define dbclear(result) pqclear(result)
+#define dbcall(id, handler, tag, function, ...) pqasyncqueryf(id, handler, tag, (handler) == NULL ? DB_CALL : 0, "SELECT %s(%s)", function , ##__VA_ARGS__)
 
 #endif /* DBAPI_PGSQL */
 
@@ -69,12 +72,15 @@ typedef SQLiteResult DBResult;
 #define dbquerysuccessful(x) sqlitequerysuccessful(x)
 #define dbgetresult(conn) sqlitegetresult(conn)
 #define dbnumfields(x) sqlite3_column_count(x->r)
+#define dbnumaffected(c, x) sqlite3_changes(sqlitegetconn())
 
 #define dbfetchrow(result) sqlitefetchrow(result)
 #define dbgetvalue(result, column) sqlitegetvalue(result, column)
 
 #define dbclear(result) sqliteclear(result)
 
+#define dbcall(...) abort() /* HA */
+
 #endif /* DBAPI_SQLITE */
 
 #endif /* BUILDING_DBAPI */