#if HAVE_MYSQL | HAVE_SQLITE
+uint32_t bacula_db_version = 0;
+
/* Forward referenced subroutines */
void print_dashes(B_DB *mdb);
void print_result(B_DB *mdb);
* calling subroutine sets and clears the mutex
*/
-/* Check that the tables conrrespond to the version we want */
-int check_tables_version(B_DB *mdb)
+/* Check that the tables correspond to the version we want */
+int check_tables_version(JCR *jcr, B_DB *mdb)
{
- uint32_t version;
char *query = "SELECT VersionId FROM Version";
- version = 0;
- db_sql_query(mdb, query, int_handler, (void *)&version);
- if (version != BDB_VERSION) {
+ bacula_db_version = 0;
+ db_sql_query(mdb, query, int_handler, (void *)&bacula_db_version);
+ if (bacula_db_version != BDB_VERSION) {
Mmsg(&mdb->errmsg, "Version error for database \"%s\". Wanted %d, got %d\n",
- mdb->db_name, BDB_VERSION, version);
- Jmsg(mdb->jcr, M_FATAL, 0, mdb->errmsg);
+ mdb->db_name, BDB_VERSION, bacula_db_version);
+ Jmsg(jcr, M_FATAL, 0, "%s", mdb->errmsg);
return 0;
}
return 1;
}
-/* Utility routine for queries */
+/* Utility routine for queries. The database MUST be locked before calling here. */
int
-QueryDB(char *file, int line, B_DB *mdb, char *cmd)
+QueryDB(char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
{
- if (sql_query(mdb, cmd)) {
+ int status;
+ if ((status=sql_query(mdb, cmd)) != 0) {
m_msg(file, line, &mdb->errmsg, _("query %s failed:\n%s\n"), cmd, sql_strerror(mdb));
- j_msg(file, line, mdb->jcr, M_FATAL, 0, mdb->errmsg);
+ j_msg(file, line, jcr, M_FATAL, 0, "%s", mdb->errmsg);
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return 0;
}
+
mdb->result = sql_store_result(mdb);
-
+
return mdb->result != NULL;
}
* 1 on success
*/
int
-InsertDB(char *file, int line, B_DB *mdb, char *cmd)
+InsertDB(char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
{
if (sql_query(mdb, cmd)) {
m_msg(file, line, &mdb->errmsg, _("insert %s failed:\n%s\n"), cmd, sql_strerror(mdb));
- j_msg(file, line, mdb->jcr, M_FATAL, 0, mdb->errmsg);
+ j_msg(file, line, jcr, M_FATAL, 0, "%s", mdb->errmsg);
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return 0;
}
if (mdb->have_insert_id) {
}
if (mdb->num_rows != 1) {
char ed1[30];
- m_msg(file, line, &mdb->errmsg, _("Insertion problem: affect_rows=%s\n"),
+ m_msg(file, line, &mdb->errmsg, _("Insertion problem: affected_rows=%s\n"),
edit_uint64(mdb->num_rows, ed1));
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return 0;
}
mdb->changes++;
* 1 on success
*/
int
-UpdateDB(char *file, int line, B_DB *mdb, char *cmd)
+UpdateDB(char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
{
if (sql_query(mdb, cmd)) {
m_msg(file, line, &mdb->errmsg, _("update %s failed:\n%s\n"), cmd, sql_strerror(mdb));
- j_msg(file, line, mdb->jcr, M_ERROR, 0, mdb->errmsg);
- j_msg(file, line, mdb->jcr, M_ERROR, 0, "%s\n", cmd);
+ j_msg(file, line, jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return 0;
}
mdb->num_rows = sql_affected_rows(mdb);
if (mdb->num_rows != 1) {
char ed1[30];
- m_msg(file, line, &mdb->errmsg, _("Update problem: affect_rows=%s\n"),
+ m_msg(file, line, &mdb->errmsg, _("Update problem: affected_rows=%s\n"),
edit_uint64(mdb->num_rows, ed1));
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return 0;
}
mdb->changes++;
* n number of rows affected
*/
int
-DeleteDB(char *file, int line, B_DB *mdb, char *cmd)
+DeleteDB(char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
{
if (sql_query(mdb, cmd)) {
m_msg(file, line, &mdb->errmsg, _("delete %s failed:\n%s\n"), cmd, sql_strerror(mdb));
- j_msg(file, line, mdb->jcr, M_ERROR, 0, mdb->errmsg);
+ j_msg(file, line, jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ if (verbose) {
+ j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
+ }
return -1;
}
mdb->changes++;
* Returns: -1 on failure
* count on success
*/
-int get_sql_record_max(B_DB *mdb)
+int get_sql_record_max(JCR *jcr, B_DB *mdb)
{
SQL_ROW row;
int stat = 0;
- if (QUERY_DB(mdb, mdb->cmd)) {
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
if ((row = sql_fetch_row(mdb)) == NULL) {
Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb));
stat = -1;
{
int errstat;
if ((errstat=rwl_writelock(&mdb->lock)) != 0) {
- j_msg(file, line, mdb->jcr, M_ABORT, 0, "rwl_writelock failure. ERR=%s\n",
+ e_msg(file, line, M_ABORT, 0, "rwl_writelock failure. ERR=%s\n",
strerror(errstat));
}
}
{
int errstat;
if ((errstat=rwl_writeunlock(&mdb->lock)) != 0) {
- j_msg(file, line, mdb->jcr, M_ABORT, 0, "rwl_writeunlock failure. ERR=%s\n",
+ e_msg(file, line, M_ABORT, 0, "rwl_writeunlock failure. ERR=%s\n",
strerror(errstat));
}
}
* much more efficient. Usually started when inserting
* file attributes.
*/
-void db_start_transaction(B_DB *mdb)
+void db_start_transaction(JCR *jcr, B_DB *mdb)
{
#ifdef xAVE_SQLITE
db_lock(mdb);
/* Allow only 10,000 changes per transaction */
if (mdb->transaction && mdb->changes > 10000) {
- db_end_transaction(mdb);
+ db_end_transaction(jcr, mdb);
}
if (!mdb->transaction) {
my_sqlite_query(mdb, "BEGIN"); /* begin transaction */
}
-void db_end_transaction(B_DB *mdb)
+void db_end_transaction(JCR *jcr, B_DB *mdb)
{
#ifdef xAVE_SQLITE
db_lock(mdb);
* and filename parts. They are returned in pool memory
* in the mdb structure.
*/
-void split_path_and_filename(B_DB *mdb, char *fname)
+void split_path_and_filename(JCR *jcr, B_DB *mdb, char *fname)
{
char *p, *f;
mdb->path[mdb->pnl] = 0;
} else {
Mmsg1(&mdb->errmsg, _("Path length is zero. File=%s\n"), fname);
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
mdb->path[0] = ' ';
mdb->path[1] = 0;
mdb->pnl = 1;