#ifndef __DBAPI_H
#define __DBAPI_H
+#ifndef DBAPI2_ADAPTER
#include "../config.h"
+#endif
#define DB_NULLIDENTIFIER 0
#define DB_CREATE 1
#ifdef DBAPI_OVERRIDE
#undef USE_DBAPI_PGSQL
-#undef USE_DBAPI_SQLITE3
+#undef USE_DBAPI_SQLITE
#endif
#ifndef BUILDING_DBAPI
typedef PQResult DBResult;
#define dbconnected() pqconnected()
-#define dbgetid() pqconnected()
+#define dbgetid() pqgetid()
#define dbfreeid(x) pqfreeid(x)
#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)
#endif /* DBAPI_PGSQL */
-#if defined(USE_DBAPI_SQLITE3) || defined(DBAPI_OVERRIDE_SQLITE3)
+#if defined(USE_DBAPI_SQLITE) || defined(DBAPI_OVERRIDE_SQLITE)
#include "../sqlite/sqlite.h"
#define dbgetid() sqlitegetid()
#define dbfreeid(x) sqlitefreeid(x)
-#define dbattach(schema) sqliteattach(schema)
-#define dbdetach(schema) sqlitedetach(schema)
-#define dbescapestring(buf, src, len) sqliteescapestring(buf, src, len)
-#define dbloadtable(tablename, init, data, fini) sqliteloadtable(tablename, init, data, fini);
+#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, 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 dbclear(result) sqliteclear(result)
-#endif /* DBAPI_SQLITE3 */
+#endif /* DBAPI_SQLITE */
#endif /* BUILDING_DBAPI */