many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
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 */
int len;
struct stat statbuf;
int errstat;
+ int retry = 0;
P(mutex);
if (mdb->connected) {
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;
}
return 0;
}
+ for (mdb->db=NULL; !mdb->db && retry++ < 10; ) {
#ifdef HAVE_SQLITE3
- int stat = sqlite3_open(db_name, &mdb->db);
- if (stat != SQLITE_OK) {
- mdb->sqlite_errmsg = (char *)sqlite3_errmsg(mdb->db);
- sqlite3_close(mdb->db);
- mdb->db = NULL;
- } else {
- mdb->sqlite_errmsg = NULL;
- }
-#ifdef SQLITE3_INIT_QUERY
- db_sql_query(mdb, SQLITE3_INIT_QUERY, NULL, NULL);
-#endif
-
+ int stat = sqlite3_open(db_name, &mdb->db);
+ if (stat != SQLITE_OK) {
+ mdb->sqlite_errmsg = (char *)sqlite3_errmsg(mdb->db);
+ sqlite3_close(mdb->db);
+ mdb->db = NULL;
+ } else {
+ mdb->sqlite_errmsg = NULL;
+ }
#else
- mdb->db = sqlite_open(
- db_name, /* database name */
- 644, /* mode */
- &mdb->sqlite_errmsg); /* error message */
+ mdb->db = sqlite_open(
+ db_name, /* database name */
+ 644, /* mode */
+ &mdb->sqlite_errmsg); /* error message */
#endif
- Dmsg0(300, "sqlite_open\n");
-
+ Dmsg0(300, "sqlite_open\n");
+ if (!mdb->db) {
+ bmicrosleep(1, 0);
+ }
+ }
if (mdb->db == NULL) {
Mmsg2(&mdb->errmsg, _("Unable to open Database=%s. ERR=%s\n"),
db_name, mdb->sqlite_errmsg ? mdb->sqlite_errmsg : _("unknown"));
}
mdb->connected = true;
free(db_name);
- if (!check_tables_version(jcr, mdb)) {
- V(mutex);
- return 0;
- }
/* set busy handler to wait when we use mult_db_connections = 1 */
#ifdef HAVE_SQLITE3
sqlite_busy_handler(mdb->db, my_busy_handler, NULL);
#endif
+#if defined(HAVE_SQLITE3) && defined(SQLITE3_INIT_QUERY)
+ db_sql_query(mdb, SQLITE3_INIT_QUERY, NULL, NULL);
+#endif
+
+ if (!check_tables_version(jcr, mdb)) {
+ V(mutex);
+ return 0;
+ }
+
+
V(mutex);
return 1;
}
* the escaped output.
*/
void
-db_escape_string(char *snew, char *old, int len)
+db_escape_string(JCR *jcr, B_DB *db, char *snew, char *old, int len)
{
char *n, *o;
* 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;
if (stat != 0) {
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;
}
/*
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) {
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 (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;
+ }
}
-char *my_sqlite_batch_lock_query = "BEGIN";
-char *my_sqlite_batch_unlock_query = "COMMIT";
-char *my_sqlite_batch_fill_path_query = "INSERT INTO Path (Path) "
- " SELECT DISTINCT Path FROM batch "
- " EXCEPT SELECT Path FROM Path ";
+#ifdef HAVE_BATCH_FILE_INSERT
+const char *my_sqlite_batch_lock_query = "BEGIN";
+const char *my_sqlite_batch_unlock_query = "COMMIT";
-char *my_sqlite_batch_fill_filename_query = "INSERT INTO Filename (Name) "
- " SELECT DISTINCT Name FROM batch "
- " EXCEPT SELECT Name FROM Filename ";
+const char *my_sqlite_batch_fill_path_query =
+ "INSERT INTO Path (Path)"
+ " SELECT DISTINCT Path FROM batch"
+ " EXCEPT SELECT Path FROM Path";
+const char *my_sqlite_batch_fill_filename_query =
+ "INSERT INTO Filename (Name)"
+ " SELECT DISTINCT Name FROM batch "
+ " EXCEPT SELECT Name FROM Filename";
+#endif /* HAVE_BATCH_FILE_INSERT */
#endif /* HAVE_SQLITE */
projects / bacula / bacula / blobdiff