#define sql_num_rows(x) (x)->nrow
#define sql_data_seek(x, i) (x)->row = (i)
#define sql_affected_rows(x) 1
-#define sql_insert_id(x) sqlite_last_insert_rowid((x)->db)
+#define sql_insert_id(x,y) sqlite_last_insert_rowid((x)->db)
#define sql_field_seek(x, y) my_sqlite_field_seek((x), (y))
#define sql_fetch_field(x) my_sqlite_fetch_field(x)
#define sql_num_fields(x) (unsigned)((x)->ncolumn)
-#define sql_table_name(x, y)
#define SQL_ROW char**
#define sql_num_rows(x) mysql_num_rows((x)->result)
#define sql_data_seek(x, i) mysql_data_seek((x)->result, (i))
#define sql_affected_rows(x) mysql_affected_rows((x)->db)
-#define sql_insert_id(x) mysql_insert_id((x)->db)
+#define sql_insert_id(x,y) mysql_insert_id((x)->db)
#define sql_field_seek(x, y) mysql_field_seek((x)->result, (y))
#define sql_fetch_field(x) mysql_fetch_field((x)->result)
#define sql_num_fields(x) mysql_num_fields((x)->result)
#define SQL_ROW MYSQL_ROW
-#define sql_table_name(x, y)
#define SQL_FIELD MYSQL_FIELD
#else
char *db_socket; /* socket for local access */
int db_port; /* port of host address */
int have_insert_id; /* do have insert_id() */
- char *table_name; /* name of table upon which an INSERT is being done */
int connected;
POOLMEM *errmsg; /* nicely edited error message */
POOLMEM *cmd; /* SQL command string */
void my_postgresql_field_seek (B_DB *mdb, int row);
int my_postgresql_query (B_DB *mdb, char *query);
void my_postgresql_free_result(B_DB *mdb);
-int my_postgresql_currval (B_DB *mdb);
+int my_postgresql_currval (B_DB *mdb, char *table_name);
/* "Generic" names for easier conversion */
#define sql_num_rows(x) ((unsigned) PQntuples((x)->result))
#define sql_data_seek(x, i) my_postgresql_data_seek((x), (i))
#define sql_affected_rows(x) ((unsigned) atoi(PQcmdTuples((x)->result)))
-#define sql_insert_id(x) my_postgresql_currval(x)
+#define sql_insert_id(x,y) my_postgresql_currval((x), (y))
#define sql_field_seek(x, y) my_postgresql_field_seek((x), (y))
#define sql_fetch_field(x) my_postgresql_fetch_field(x)
#define sql_num_fields(x) (unsigned) (x)->num_fields
-#define sql_table_name(x, y) (x)->table_name = (y)
#define SQL_ROW POSTGRESQL_ROW
#define SQL_FIELD POSTGRESQL_FIELD