dbapi loadtable function should mutate the table name to include the schema.

diff --git a/dbapi2/dbapi2.c b/dbapi2/dbapi2.c
index d6ca8bed73e8fea7d5787e1995737b7c4cde0fef..0e733629a78293c0c58ea4a0c86e9ba513514ce0 100644 (file)
--- a/dbapi2/dbapi2.c
+++ b/dbapi2/dbapi2.c
@@ -147,6 +147,10 @@ static void dbsafesimplequery(const DBAPIConn *db, const char *format, const cha
   db->__query(db, NULL, NULL, buf);
 }
 
+static void dbloadtable(const DBAPIConn *db, DBAPIQueryCallback init, DBAPIQueryCallback data, DBAPIQueryCallback fini, DBAPIUserData tag, const char *tablename) {
+  db->__loadtable(db, init, data, fini, tag, db->tablename(db, tablename));
+}
+
 DBAPIConn *dbapi2open(const char *provider, const char *database) {
   int i, found = -1;
   DBAPIConn *db;
@@ -187,7 +191,7 @@ DBAPIConn *dbapi2open(const char *provider, const char *database) {
   db->query = dbsafequery;
   db->createtable = dbsafecreatetable;
   db->squery = dbsafesimplequery;
-  db->loadtable = p->loadtable;
+  db->loadtable = dbloadtable;
   db->escapestring = p->escapestring;
   db->tablename = p->tablename;
   db->unsafequery = dbunsafequery;
@@ -198,6 +202,7 @@ DBAPIConn *dbapi2open(const char *provider, const char *database) {
   db->__close = p->close;
   db->__quotestring = p->quotestring;
   db->__createtable = p->createtable;
+  db->__loadtable = p->loadtable;
 
   strlcpy(db->name, database, DBNAME_LEN);
 

diff --git a/dbapi2/dbapi2.h b/dbapi2/dbapi2.h
index dc73fcde4e8b2ec0b03c4ca444b6eba3d37465f8..0c3c8644623141c201429757f0d9f4f8faad9dcd 100644 (file)
--- a/dbapi2/dbapi2.h
+++ b/dbapi2/dbapi2.h
@@ -87,6 +87,7 @@ typedef struct DBAPIConn {
   DBAPIQuoteString __quotestring;
   DBAPIQueryV __query;
   DBAPICreateTableV __createtable;
+  DBAPILoadTable __loadtable;
 } DBAPIConn;
 
 typedef char *(*DBAPIResultGet)(const struct DBAPIResult *, unsigned int);