TRUSTS: require sqlite

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

diff --git a/dbapi/dbapi.h b/dbapi/dbapi.h
index 2a93afb3beb2a3e238a76072bc6ae4c2bef10b81..990c43c8c8f21ac9127b6560039889139484fa01 100644 (file)
--- a/dbapi/dbapi.h
+++ b/dbapi/dbapi.h
@@ -1,10 +1,13 @@
 #ifndef __DBAPI_H
 #define __DBAPI_H
 
+#ifndef DBAPI2_ADAPTER
 #include "../config.h"
+#endif
 
 #define DB_NULLIDENTIFIER 0
 #define DB_CREATE 1
+#define DB_CALL 2
 
 #ifdef DBAPI_OVERRIDE
 #undef USE_DBAPI_PGSQL
@@ -29,17 +32,20 @@ typedef PQResult DBResult;
 #define dbattach(schema) pqcreateschema(schema)
 #define dbdetach(schema)
 #define dbescapestring(buf, src, len)  PQescapeString(buf, src, len)
-#define dbloadtable(tablename, init, data, fini) pqloadtable(tablename, init, data, fini);
+#define dbloadtable(tablename, init, data, fini) pqloadtable(tablename, init, data, fini, NULL);
+#define dbloadtable_tag(tablename, init, data, fini, tag) pqloadtable(tablename, init, data, fini, tag);
 
 #define dbasyncqueryf(id, handler, tag, flags, format, ...) pqasyncqueryf(id, handler, tag, flags, format , ##__VA_ARGS__)
 #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 */
 
@@ -56,21 +62,25 @@ typedef SQLiteResult DBResult;
 #define dbgetid() sqlitegetid()
 #define dbfreeid(x) sqlitefreeid(x)
 
-#define dbattach(schema) sqliteattach(schema)
-#define dbdetach(schema) sqlitedetach(schema)
+#define dbattach(schema) sqliteattach((schema))
+#define dbdetach(schema) sqlitedetach((schema))
 #define dbescapestring(buf, src, len) sqliteescapestring(buf, (char *)(src), len)
-#define dbloadtable(tablename, init, data, fini) sqliteloadtable(tablename, init, data, fini);
+#define dbloadtable(tablename, init, data, fini) sqliteloadtable(tablename, init, data, fini, NULL);
+#define dbloadtable_tag(tablename, init, data, fini, tag) sqliteloadtable(tablename, init, data, fini, tag);
 
 #define dbasyncqueryf(id, handler, tag, flags, format, ...) sqliteasyncqueryf(id, handler, tag, flags, format , ##__VA_ARGS__)
 #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 */