*/
/*
- Copyright (C) 2002-2003 Kern Sibbald and John Walker
+ Copyright (C) 2002-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
* -----------------------------------------------------------------------
*/
-extern char *working_directory;
+extern const char *working_directory;
/* List of open databases */
static BQUEUE db_list = {&db_list, &db_list};
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-int QueryDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
+int QueryDB(const char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
/*
* never have errors, or it is really fatal.
*/
B_DB *
-db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
- char *db_address, int db_port, char *db_socket)
+db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char *db_password,
+ const char *db_address, int db_port, const char *db_socket)
{
B_DB *mdb;
/* Look to see if DB already open */
for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
if (strcmp(mdb->db_name, db_name) == 0) {
- Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
+ Dmsg2(300, "DB REopen %d %s\n", mdb->ref_count, db_name);
mdb->ref_count++;
V(mutex);
return mdb; /* already open */
}
}
- Dmsg0(100, "db_open first time\n");
+ Dmsg0(300, "db_open first time\n");
mdb = (B_DB *) malloc(sizeof(B_DB));
memset(mdb, 0, sizeof(B_DB));
mdb->db_name = bstrdup(db_name);
/*
* Now actually open the database. This can generate errors,
* which are returned in the errmsg
+ *
+ * DO NOT close the database or free(mdb) here !!!!
*/
int
db_open_database(JCR *jcr, B_DB *mdb)
644, /* mode */
&mdb->sqlite_errmsg); /* error message */
- Dmsg0(50, "sqlite_open\n");
+ Dmsg0(300, "sqlite_open\n");
if (mdb->db == NULL) {
Mmsg2(&mdb->errmsg, _("Unable to open Database=%s. ERR=%s\n"),
void
db_close_database(JCR *jcr, B_DB *mdb)
{
+ if (!mdb) {
+ return;
+ }
P(mutex);
mdb->ref_count--;
if (mdb->ref_count == 0) {
db_lock(mdb);
- Mmsg(&mdb->cmd,
+ 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));
+ 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));
+ 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,
+ 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));
+ Mmsg(mdb->errmsg, _("next_index update error: ERR=%s\n"), sql_strerror(mdb));
db_unlock(mdb);
return 0;
}
* Escape strings so that SQLite is happy
*
* NOTE! len is the length of the old string. Your new
- * string must be long enough (max 2*old) to hold
+ * string must be long enough (max 2*old+1) to hold
* the escaped output.
*/
void
* 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, char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+int 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.ctx = ctx;
stat = sqlite_exec(mdb->db, query, sqlite_result, (void *)&rh_data, &mdb->sqlite_errmsg);
if (stat != 0) {
- Mmsg(&mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
+ Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
return 0;
}
void my_sqlite_free_table(B_DB *mdb)
{
- unsigned int i;
+ int i;
if (mdb->fields_defined) {
for (i=0; i < sql_num_fields(mdb); i++) {
free(mdb->fields[i]);
}
free(mdb->fields);
- mdb->fields_defined = FALSE;
+ mdb->fields_defined = false;
}
sqlite_free_table(mdb->result);
mdb->nrow = mdb->ncolumn = 0;
void my_sqlite_field_seek(B_DB *mdb, int field)
{
- unsigned int i, j;
+ int i, j;
if (mdb->result == NULL) {
return;
}
mdb->fields[i]->name = mdb->result[i];
mdb->fields[i]->length = strlen(mdb->fields[i]->name);
mdb->fields[i]->max_length = mdb->fields[i]->length;
- for (j=1; j <= (unsigned)mdb->nrow; j++) {
- uint32_t len;
+ for (j=1; j <= mdb->nrow; j++) {
+ int len;
if (mdb->result[i + mdb->ncolumn *j]) {
len = (uint32_t)strlen(mdb->result[i + mdb->ncolumn * j]);
} else {
}
mdb->fields_defined = TRUE;
}
- if (field > (int)sql_num_fields(mdb)) {
- field = (int)sql_num_fields(mdb);
+ if (field > sql_num_fields(mdb)) {
+ field = sql_num_fields(mdb);
}
mdb->field = field;
return mdb->fields[mdb->field++];
}
-static void
-list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
-{
- SQL_FIELD *field;
- unsigned int i, j;
-
- sql_field_seek(mdb, 0);
- send(ctx, "+");
- for (i = 0; i < sql_num_fields(mdb); i++) {
- field = sql_fetch_field(mdb);
- for (j = 0; j < field->max_length + 2; j++)
- send(ctx, "-");
- send(ctx, "+");
- }
- send(ctx, "\n");
-}
-
-/*
- * If full_list is set, we list vertically, otherwise, we
- * list on one line horizontally.
- */
-void
-list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
-{
- SQL_FIELD *field;
- SQL_ROW row;
- unsigned int i, col_len, max_len = 0;
- char buf[2000], ewc[30];
-
- if (mdb->result == NULL || mdb->nrow == 0) {
- send(ctx, _("No results to list.\n"));
- return;
- }
- /* determine column display widths */
- sql_field_seek(mdb, 0);
- for (i = 0; i < sql_num_fields(mdb); i++) {
- field = sql_fetch_field(mdb);
- col_len = strlen(field->name);
- if (type == VERT_LIST) {
- if (col_len > max_len) {
- max_len = col_len;
- }
- } else {
- if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
- field->max_length += (field->max_length - 1) / 3;
- }
- if (col_len < field->max_length) {
- col_len = field->max_length;
- }
- if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
- col_len = 4; /* 4 = length of the word "NULL" */
- }
- field->max_length = col_len; /* reset column info */
- }
- }
-
- if (type == VERT_LIST) {
- goto vertical_list;
- }
-
- list_dashes(mdb, send, ctx);
- send(ctx, "|");
- sql_field_seek(mdb, 0);
- for (i = 0; i < sql_num_fields(mdb); i++) {
- field = sql_fetch_field(mdb);
- bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
- send(ctx, buf);
- }
- send(ctx, "\n");
- list_dashes(mdb, send, ctx);
-
- while ((row = sql_fetch_row(mdb)) != NULL) {
- sql_field_seek(mdb, 0);
- send(ctx, "|");
- for (i = 0; i < sql_num_fields(mdb); i++) {
- field = sql_fetch_field(mdb);
- if (row[i] == NULL) {
- bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
- } else if (IS_NUM(field->type)) {
- bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,
- add_commas(row[i], ewc));
- } else {
- bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
- }
- send(ctx, buf);
- }
- send(ctx, "\n");
- }
- list_dashes(mdb, send, ctx);
- return;
-
-vertical_list:
-
- while ((row = sql_fetch_row(mdb)) != NULL) {
- sql_field_seek(mdb, 0);
- for (i = 0; i < sql_num_fields(mdb); i++) {
- field = sql_fetch_field(mdb);
- if (row[i] == NULL) {
- bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
- } else if (IS_NUM(field->type)) {
- bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name,
- add_commas(row[i], ewc));
- } else {
- bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]);
- }
- send(ctx, buf);
- }
- send(ctx, "\n");
- }
- return;
-}
#endif /* HAVE_SQLITE */
projects / bacula / bacula / blobdiff