typedef struct s_sql_field {
char *name; /* name of column */
- uint32_t length; /* length */
- uint32_t max_length; /* max length */
+ int length; /* length */
+ int max_length; /* max length */
uint32_t type; /* type */
uint32_t flags; /* flags */
} SQL_FIELD;
brwlock_t lock; /* transaction lock */
struct sqlite *db;
char **result;
+ int status;
int nrow; /* nrow returned from sqlite */
int ncolumn; /* ncolum returned from sqlite */
int num_rows; /* used by code */
*
* S Q L I T E
*/
-#define sql_store_result(x) x->result
+#define sql_store_result(x) (x)->result
#define sql_free_result(x) my_sqlite_free_table(x)
#define sql_fetch_row(x) my_sqlite_fetch_row(x)
-#define sql_query(x, y) my_sqlite_query(x, y)
+#define sql_query(x, y) my_sqlite_query((x), (y))
#define sql_close(x) sqlite_close((x)->db)
#define sql_strerror(x) (x)->sqlite_errmsg?(x)->sqlite_errmsg:"unknown"
#define sql_num_rows(x) (x)->nrow
-#define sql_data_seek(x, i) (x)->row = i
+#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_field_seek(x, y) my_sqlite_field_seek(x, y)
+#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_num_fields(x) ((x)->ncolumn)
#define SQL_ROW char**
/* In cats/sqlite.c */
-extern int my_sqlite_query(B_DB *mdb, char *cmd);
-extern SQL_ROW my_sqlite_fetch_row(B_DB *mdb);
-extern void my_sqlite_free_table(B_DB *mdb);
+void my_sqlite_free_table(B_DB *mdb);
+SQL_ROW my_sqlite_fetch_row(B_DB *mdb);
+int my_sqlite_query(B_DB *mdb, char *cmd);
+void my_sqlite_field_seek(B_DB *mdb, int field);
+SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb);
+
#else
MYSQL mysql;
MYSQL *db;
MYSQL_RES *result;
+ int status;
my_ulonglong num_rows;
int ref_count;
char *db_name;
int pnl; /* path name length */
} B_DB;
+#define DB_STATUS int
/* "Generic" names for easier conversion */
#define sql_store_result(x) mysql_store_result((x)->db)
#define sql_free_result(x) mysql_free_result((x)->result)
#define sql_fetch_row(x) mysql_fetch_row((x)->result)
-#define sql_query(x, y) mysql_query((x)->db, y)
+#define sql_query(x, y) mysql_query((x)->db, (y))
#define sql_close(x) mysql_close((x)->db)
#define sql_strerror(x) mysql_error((x)->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_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_field_seek(x, y) mysql_field_seek((x)->result, y)
+#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_num_fields(x) (int)mysql_num_fields((x)->result)
#define SQL_ROW MYSQL_ROW
#define SQL_FIELD MYSQL_FIELD
+#else
+
+#ifdef HAVE_POSTGRESQL
+
+#define BDB_VERSION 7
+
+#include <libpq-fe.h>
+
+/* TEMP: the following is taken from select OID, typname from pg_type; */
+#define IS_NUM(x) ((x) == 20 || (x) == 21 || (x) == 23 || (x) == 700 || (x) == 701)
+#define IS_NOT_NULL(x) ((x) == 1)
+
+typedef char **POSTGRESQL_ROW;
+typedef struct pg_field {
+ char *name;
+ int max_length;
+ unsigned int type;
+ unsigned int flags; // 1 == not null
+} POSTGRESQL_FIELD;
+
+
+/*
+ * This is the "real" definition that should only be
+ * used inside sql.c and associated database interface
+ * subroutines.
+ *
+ * P O S T G R E S Q L
+ */
+typedef struct s_db {
+ BQUEUE bq; /* queue control */
+ brwlock_t lock; /* transaction lock */
+ PGconn *db;
+ PGresult *result;
+ int status;
+ POSTGRESQL_ROW row;
+ POSTGRESQL_FIELD *fields;
+ int num_rows;
+ int num_fields;
+ int row_number; /* what row number did we get via my_postgresql_data_seek? */
+ int field_number; /* what field number did we get via my_postgresql_field_seek? */
+ int ref_count;
+ char *db_name;
+ char *db_user;
+ char *db_password;
+ char *db_address; /* host address */
+ char *db_socket; /* socket for local access */
+ int db_port; /* port of host address */
+ int have_insert_id; /* do have insert_id() */
+ int connected;
+ POOLMEM *errmsg; /* nicely edited error message */
+ POOLMEM *cmd; /* SQL command string */
+ POOLMEM *cached_path;
+ int cached_path_len; /* length of cached path */
+ uint32_t cached_path_id;
+ int changes; /* changes made to db */
+ POOLMEM *fname; /* Filename only */
+ POOLMEM *path; /* Path only */
+ POOLMEM *esc_name; /* Escaped file/path name */
+ int fnl; /* file name length */
+ int pnl; /* path name length */
+} B_DB;
+
+void my_postgresql_free_result(B_DB *mdb);
+POSTGRESQL_ROW my_postgresql_fetch_row (B_DB *mdb);
+int my_postgresql_query (B_DB *mdb, char *query);
+void my_postgresql_data_seek (B_DB *mdb, int row);
+int my_postgresql_currval (B_DB *mdb, char *table_name);
+void my_postgresql_field_seek (B_DB *mdb, int row);
+POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb);
+
+
+/* "Generic" names for easier conversion */
+#define sql_store_result(x) ((x)->result)
+#define sql_free_result(x) my_postgresql_free_result(x)
+#define sql_fetch_row(x) my_postgresql_fetch_row(x)
+#define sql_query(x, y) my_postgresql_query((x), (y))
+#define sql_close(x) PQfinish((x)->db)
+#define sql_strerror(x) PQresultErrorMessage((x)->result)
+#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,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) ((x)->num_fields)
+#define SQL_ROW POSTGRESQL_ROW
+#define SQL_FIELD POSTGRESQL_FIELD
+
#else /* USE BACULA DB routines */
#define HAVE_BACULA_DB 1
#endif /* HAVE_MYSQL */
#endif /* HAVE_SQLITE */
+#endif /* HAVE_POSTGRESQL */
/* Use for better error location printing */
#define UPDATE_DB(jcr, db, cmd) UpdateDB(__FILE__, __LINE__, jcr, db, cmd)
extern uint32_t bacula_db_version;
-/* ***FIXME*** FileId_t should be uint64_t */
+/* ***FIXME*** FileId_t should *really* be uint64_t
+ * but at the current time, this breaks MySQL.
+ */
typedef uint32_t FileId_t;
typedef uint32_t DBId_t; /* general DB id type */
typedef uint32_t JobId_t;
uint64_t VolBytes; /* Number of bytes written */
uint64_t MaxVolBytes; /* Max bytes to write to Volume */
uint64_t VolCapacityBytes; /* capacity estimate */
+ uint64_t VolReadTime; /* time spent reading volume */
+ uint64_t VolWriteTime; /* time spent writing volume */
utime_t VolRetention; /* Volume retention in seconds */
utime_t VolUseDuration; /* time in secs volume can be used */
uint32_t MaxVolJobs; /* Max Jobs on Volume */
uint32_t MaxVolFiles; /* Max files on Volume */
int32_t Recycle; /* recycle yes/no */
int32_t Slot; /* slot in changer */
- int32_t Drive; /* drive in changer */
int32_t InChanger; /* Volume currently in changer */
char VolStatus[20]; /* Volume status */
/* Extra stuff not in DB */
/* Since the database returns times as strings, this is how we pass
* them back.
*/
- char cFirstWritten[MAX_TIME_LENGTH]; /* FirstWritten returned from DB */
+ char cFirstWritten[MAX_TIME_LENGTH]; /* FirstWritten returned from DB */
char cLastWritten[MAX_TIME_LENGTH]; /* LastWritten returned from DB */
- char cLabelData[MAX_TIME_LENGTH]; /* LabelData returned from DB */
+ char cLabelData[MAX_TIME_LENGTH]; /* LabelData returned from DB */
};
/* Client record -- same as the database */
};
+
#include "protos.h"
#include "jcr.h"
+
+/*
+ * Some functions exported by sql.c for use withing the
+ * cats directory.
+ */
+void list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type);
+void list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx);
+int get_sql_record_max(JCR *jcr, B_DB *mdb);
+int check_tables_version(JCR *jcr, B_DB *mdb);
+void _db_unlock(char *file, int line, B_DB *mdb);
+void _db_lock(char *file, int line, B_DB *mdb);
#endif /* __SQL_H_ */
projects / bacula / bacula / blobdiff