/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-int QueryDB(const char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
-
-
/*
* Retrieve database type
*/
const char *
db_get_type(void)
{
+#ifdef HAVE_SQLITE3
+ return "SQLite3";
+#else
return "SQLite";
+#endif
}
/*
mdb = (B_DB *) malloc(sizeof(B_DB));
memset(mdb, 0, sizeof(B_DB));
mdb->db_name = bstrdup(db_name);
- mdb->have_insert_id = TRUE;
+ mdb->have_insert_id = true;
mdb->errmsg = get_pool_memory(PM_EMSG); /* get error message buffer */
*mdb->errmsg = 0;
mdb->cmd = get_pool_memory(PM_EMSG); /* get command buffer */
mdb->connected = FALSE;
if ((errstat=rwl_init(&mdb->lock)) != 0) {
+ berrno be;
Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
- strerror(errstat));
+ be.bstrerror(errstat));
V(mutex);
return 0;
}
* Submit a general SQL command (cmd), and for each row returned,
* the sqlite_handler is called with the ctx.
*/
-int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+bool db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
{
struct rh_data rh_data;
int stat;
rh_data.result_handler = result_handler;
rh_data.ctx = ctx;
stat = sqlite_exec(mdb->db, query, sqlite_result, (void *)&rh_data, &mdb->sqlite_errmsg);
- if (stat != 0) {
+ if (stat != SQLITE_OK) {
Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
- return 0;
+ return false;
}
db_unlock(mdb);
- return 1;
+ return true;
}
/*
}
stat = sqlite_get_table(mdb->db, (char *)cmd, &mdb->result, &mdb->nrow, &mdb->ncolumn,
&mdb->sqlite_errmsg);
- mdb->row = 0; /* row fetched */
+ mdb->row = 0; /* no row fetched yet */
+ if (stat != 0) { /* something went wrong */
+ mdb->nrow = mdb->ncolumn = 0;
+ }
return stat;
}
/* Fetch one row at a time */
SQL_ROW my_sqlite_fetch_row(B_DB *mdb)
{
- if (mdb->row >= mdb->nrow) {
+ if (!mdb->result || (mdb->row >= mdb->nrow)) {
return NULL;
}
mdb->row++;
if (mdb->fields_defined) {
for (i=0; i < sql_num_fields(mdb); i++) {
- free(mdb->fields[i]);
+ if (mdb->fields[i]) {
+ free(mdb->fields[i]);
+ mdb->fields[i] = NULL;
+ }
+ }
+ if (mdb->fields) {
+ free(mdb->fields);
+ mdb->fields = NULL;
}
- free(mdb->fields);
mdb->fields_defined = false;
}
if (mdb->result) {
{
int i, j;
if (mdb->result == NULL) {
+ mdb->field = 0;
return;
}
/* On first call, set up the fields */
mdb->fields[i]->type = 0;
mdb->fields[i]->flags = 1; /* not null */
}
- mdb->fields_defined = TRUE;
+ mdb->fields_defined = true;
}
- if (field > sql_num_fields(mdb)) {
- field = sql_num_fields(mdb);
+ if (sql_num_fields(mdb) <= 0) {
+ field = 0;
+ } else if (field > sql_num_fields(mdb) - 1) {
+ field = sql_num_fields(mdb) - 1;
}
mdb->field = field;
-
}
SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb)
{
- return mdb->fields[mdb->field++];
+ if (mdb->fields_defined && mdb->field < sql_num_fields(mdb)) {
+ return mdb->fields[mdb->field++];
+ } else {
+ mdb->field = 0;
+ return NULL;
+ }
}
#ifdef HAVE_BATCH_FILE_INSERT