From 011881a90d22baf4920ef11cc6d58d29e97f9fd5 Mon Sep 17 00:00:00 2001 From: Dan Langille Date: Thu, 18 Dec 2003 17:03:13 +0000 Subject: [PATCH] replace sql_table_name() with an extra parameter on sql_insert_id(). git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@892 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/cats.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h index f10b695883..7178c7621b 100644 --- a/bacula/src/cats/cats.h +++ b/bacula/src/cats/cats.h @@ -126,11 +126,10 @@ typedef struct s_db { #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** @@ -197,12 +196,11 @@ typedef struct s_db { #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 @@ -253,7 +251,6 @@ typedef struct s_db { 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 */ @@ -275,7 +272,7 @@ void my_postgresql_data_seek (B_DB *mdb, int row); 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 */ @@ -288,11 +285,10 @@ int my_postgresql_currval (B_DB *mdb); #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 -- 2.39.5