Correct compile error

[bacula/bacula] / bacula / src / cats / sqlite.c

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 935f5eb0348ac19b1cc7c095899a14168527334d..5f129f4f75ad71e2f040bbaccc5519c55d48bbe2 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -7,8 +7,8 @@
    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
@@ -187,6 +187,9 @@ db_open_database(JCR *jcr, B_DB *mdb)
    } else {
       mdb->sqlite_errmsg = NULL;
    }
+#ifdef SQLITE3_INIT_QUERY
+   db_sql_query(mdb, SQLITE3_INIT_QUERY, NULL, NULL);
+#endif
 
 #else
    mdb->db = sqlite_open(
@@ -203,7 +206,8 @@ db_open_database(JCR *jcr, B_DB *mdb)
       free(db_name);
       V(mutex);
       return 0;
-   }
+   }       
+   mdb->connected = true;
    free(db_name);
    if (!check_tables_version(jcr, mdb)) {
       V(mutex);
@@ -217,7 +221,6 @@ db_open_database(JCR *jcr, B_DB *mdb)
    sqlite_busy_handler(mdb->db, my_busy_handler, NULL);
 #endif
 
-   mdb->connected = true;
    V(mutex);
    return 1;
 }
@@ -230,6 +233,7 @@ db_close_database(JCR *jcr, B_DB *mdb)
    }
    db_end_transaction(jcr, mdb);
    P(mutex);
+   sql_free_result(mdb);
    mdb->ref_count--;
    if (mdb->ref_count == 0) {
       qdchain(&mdb->bq);
@@ -252,43 +256,19 @@ db_close_database(JCR *jcr, B_DB *mdb)
    V(mutex);
 }
 
+void db_thread_cleanup()
+{
+#ifdef HAVE_SQLITE3
+   sqlite3_thread_cleanup();
+#endif
+}
+
 /*
  * Return the next unique index (auto-increment) for
  * the given table.  Return 0 on error.
  */
 int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
 {
-#ifdef xxxx
-   SQL_ROW row;
-
-   db_lock(mdb);
-
-   Mmsg(mdb->cmd,
-"SELECT id FROM NextId WHERE TableName=\"%s\"", table);
-   if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
-      Mmsg(mdb->errmsg, _("next_index query error: ERR=%s\n"), sql_strerror(mdb));
-      db_unlock(mdb);
-      return 0;
-   }
-   if ((row = sql_fetch_row(mdb)) == NULL) {
-      Mmsg(mdb->errmsg, _("Error fetching index: ERR=%s\n"), sql_strerror(mdb));
-      db_unlock(mdb);
-      return 0;
-   }
-   bstrncpy(index, row[0], 28);
-   sql_free_result(mdb);
-
-   Mmsg(mdb->cmd,
-"UPDATE NextId SET id=id+1 WHERE TableName=\"%s\"", table);
-   if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
-      Mmsg(mdb->errmsg, _("next_index update error: ERR=%s\n"), sql_strerror(mdb));
-      db_unlock(mdb);
-      return 0;
-   }
-   sql_free_result(mdb);
-
-   db_unlock(mdb);
-#endif
    strcpy(index, "NULL");
    return 1;
 }
@@ -383,6 +363,7 @@ int my_sqlite_query(B_DB *mdb, const char *cmd)
 {
    int stat;
 
+   my_sqlite_free_table(mdb);
    if (mdb->sqlite_errmsg) {
 #ifdef HAVE_SQLITE3
       sqlite3_free(mdb->sqlite_errmsg);
@@ -418,7 +399,10 @@ void my_sqlite_free_table(B_DB *mdb)
       free(mdb->fields);
       mdb->fields_defined = false;
    }
-   sqlite_free_table(mdb->result);
+   if (mdb->result) {
+      sqlite_free_table(mdb->result);
+      mdb->result = NULL;
+   }
    mdb->nrow = mdb->ncolumn = 0;
 }