*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 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
* never have errors, or it is really fatal.
*/
B_DB *
-db_init_database(char *db_name, char *db_user, char *db_password)
+db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
+ char *db_address, int db_port, char *db_socket)
{
B_DB *mdb;
+ if (!db_user) {
+ Jmsg(jcr, M_FATAL, 0, _("A user name for MySQL must be supplied.\n"));
+ return NULL;
+ }
P(mutex); /* lock DB queue */
/* Look to see if DB already open */
for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
memset(mdb, 0, sizeof(B_DB));
mdb->db_name = bstrdup(db_name);
mdb->db_user = bstrdup(db_user);
- mdb->db_password = bstrdup(db_password);
+ if (db_password) {
+ mdb->db_password = bstrdup(db_password);
+ }
+ if (db_address) {
+ mdb->db_address = bstrdup(db_address);
+ }
+ if (db_socket) {
+ mdb->db_socket = bstrdup(db_socket);
+ }
+ mdb->db_port = db_port;
mdb->have_insert_id = TRUE;
- mdb->errmsg = (char *) get_pool_memory(PM_EMSG); /* get error message buffer */
+ mdb->errmsg = get_pool_memory(PM_EMSG); /* get error message buffer */
*mdb->errmsg = 0;
- mdb->cmd = (char *) get_pool_memory(PM_EMSG); /* get command buffer */
+ mdb->cmd = get_pool_memory(PM_EMSG); /* get command buffer */
+ mdb->cached_path = get_pool_memory(PM_FNAME);
+ mdb->cached_path_id = 0;
mdb->ref_count = 1;
+ mdb->fname = get_pool_memory(PM_FNAME);
+ mdb->path = get_pool_memory(PM_FNAME);
+ mdb->esc_name = get_pool_memory(PM_FNAME);
qinsert(&db_list, &mdb->bq); /* put db in list */
V(mutex);
return mdb;
* which are returned in the errmsg
*/
int
-db_open_database(B_DB *mdb)
+db_open_database(JCR *jcr, B_DB *mdb)
{
+ int errstat;
+
P(mutex);
if (mdb->connected) {
V(mutex);
return 1;
}
mdb->connected = FALSE;
- if (pthread_mutex_init(&mdb->mutex, NULL) != 0) {
- Mmsg1(&mdb->errmsg, "Unable to initialize DB mutex. ERR=%s\n", strerror(errno));
+
+ if ((errstat=rwl_init(&mdb->lock)) != 0) {
+ Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
+ strerror(errstat));
V(mutex);
return 0;
}
/* connect to the database */
+#ifdef HAVE_EMBEDDED_MYSQL
+ mysql_server_init(0, NULL, NULL);
+#endif
mysql_init(&(mdb->mysql));
Dmsg0(50, "mysql_init done\n");
mdb->db = mysql_real_connect(
&(mdb->mysql), /* db */
- NULL, /* default = localhost */
+ mdb->db_address, /* default = localhost */
mdb->db_user, /* login name */
mdb->db_password, /* password */
mdb->db_name, /* database name */
- 0, /* default port */
- NULL, /* default = socket */
- 0); /* flags = none */
+ mdb->db_port, /* default port */
+ mdb->db_socket, /* default = socket */
+ CLIENT_FOUND_ROWS); /* flags */
- /* If no connect, try once more incase it is a timing problem */
+ /* If no connect, try once more in case it is a timing problem */
if (mdb->db == NULL) {
mdb->db = mysql_real_connect(
&(mdb->mysql), /* db */
- NULL, /* default = localhost */
+ mdb->db_address, /* default = localhost */
mdb->db_user, /* login name */
mdb->db_password, /* password */
mdb->db_name, /* database name */
- 0, /* default port */
- NULL, /* default = socket */
- 0); /* flags = none */
+ mdb->db_port, /* default port */
+ mdb->db_socket, /* default = socket */
+ CLIENT_FOUND_ROWS); /* flags */
}
Dmsg0(50, "mysql_real_connect done\n");
return 0;
}
- if (!check_tables_version(mdb)) {
+ if (!check_tables_version(jcr, mdb)) {
V(mutex);
+ db_close_database(jcr, mdb);
return 0;
}
+#ifdef HAVE_TREAD_SAFE_MYSQL
+ my_thread_init();
+#endif
+
mdb->connected = TRUE;
V(mutex);
return 1;
}
void
-db_close_database(B_DB *mdb)
+db_close_database(JCR *jcr, B_DB *mdb)
{
P(mutex);
mdb->ref_count--;
+#ifdef HAVE_TREAD_SAFE_MYSQL
+ my_thread_end();
+#endif
if (mdb->ref_count == 0) {
qdchain(&mdb->bq);
if (mdb->connected && mdb->db) {
sql_close(mdb);
+#ifdef HAVE_EMBEDDED_MYSQL
+ mysql_server_end();
+#endif
}
- pthread_mutex_destroy(&mdb->mutex);
+ rwl_destroy(&mdb->lock);
free_pool_memory(mdb->errmsg);
free_pool_memory(mdb->cmd);
+ free_pool_memory(mdb->cached_path);
+ free_pool_memory(mdb->fname);
+ free_pool_memory(mdb->path);
+ free_pool_memory(mdb->esc_name);
if (mdb->db_name) {
free(mdb->db_name);
}
if (mdb->db_password) {
free(mdb->db_password);
}
+ if (mdb->db_address) {
+ free(mdb->db_address);
+ }
+ if (mdb->db_socket) {
+ free(mdb->db_socket);
+ }
free(mdb);
}
V(mutex);
* For MySQL, NULL causes the auto-increment value
* to be updated.
*/
-char *db_next_index(B_DB *mdb, char *table)
+int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
{
- return "NULL";
+ strcpy(index, "NULL");
+ return 1;
}
-
+/*
+ * Escape strings so that MySQL is happy
+ *
+ * NOTE! len is the length of the old string. Your new
+ * string must be long enough (max 2*old+1) to hold
+ * the escaped output.
+ */
void
db_escape_string(char *snew, char *old, int len)
{
mysql_escape_string(snew, old, len);
+
+#ifdef DO_IT_MYSELF
+
+/* Should use mysql_real_escape_string ! */
+unsigned long mysql_real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length);
+
+ char *n, *o;
+
+ n = snew;
+ o = old;
+ while (len--) {
+ switch (*o) {
+ case 0:
+ *n++= '\\';
+ *n++= '0';
+ o++;
+ break;
+ case '\n':
+ *n++= '\\';
+ *n++= 'n';
+ o++;
+ break;
+ case '\r':
+ *n++= '\\';
+ *n++= 'r';
+ o++;
+ break;
+ case '\\':
+ *n++= '\\';
+ *n++= '\\';
+ o++;
+ break;
+ case '\'':
+ *n++= '\\';
+ *n++= '\'';
+ o++;
+ break;
+ case '"':
+ *n++= '\\';
+ *n++= '"';
+ o++;
+ break;
+ case '\032':
+ *n++= '\\';
+ *n++= 'Z';
+ o++;
+ break;
+ default:
+ *n++= *o++;
+ }
+ }
+ *n = 0;
+#endif
}
/*
{
SQL_ROW row;
- P(mdb->mutex);
+ db_lock(mdb);
if (sql_query(mdb, query) != 0) {
Mmsg(&mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
if (result_handler != NULL) {
sql_free_result(mdb);
}
}
- V(mdb->mutex);
+ db_unlock(mdb);
return 1;
}
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)
+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;
+ SQL_ROW row;
+ unsigned int i, col_len, max_len = 0;
char buf[2000], ewc[30];
if (mdb->result == NULL) {
+ 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);
- if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
- field->max_length += (field->max_length - 1) / 3;
- }
col_len = strlen(field->name);
- 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) {
+ 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);
sql_field_seek(mdb, 0);
for (i = 0; i < sql_num_fields(mdb); i++) {
field = sql_fetch_field(mdb);
- sprintf(buf, " %-*s |", field->max_length, field->name);
+ bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
send(ctx, buf);
}
send(ctx, "\n");
for (i = 0; i < sql_num_fields(mdb); i++) {
field = sql_fetch_field(mdb);
if (row[i] == NULL) {
- sprintf(buf, " %-*s |", field->max_length, "NULL");
+ bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
} else if (IS_NUM(field->type)) {
- sprintf(buf, " %*s |", field->max_length,
+ bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,
add_commas(row[i], ewc));
} else {
- sprintf(buf, " %-*s |", field->max_length, row[i]);
+ 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;
}
projects / bacula / bacula / blobdiff