/*
Bacula® - The Network Backup Solution
- Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2003-2010 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
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.
* Dan Langille, December 2003
* based upon work done by Kern Sibbald, March 2000
*
- * Version $Id$
*/
#ifdef HAVE_POSTGRESQL
#include "postgres_ext.h" /* needed for NAMEDATALEN */
+#include "pg_config_manual.h" /* get NAMEDATALEN on version 8.3 or later */
/* -----------------------------------------------------------------------
*
*/
/* List of open databases */
-static BQUEUE db_list = {&db_list, &db_list};
+static dlist *db_list = NULL;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
const char *db_address, int db_port, const char *db_socket,
int mult_db_connections)
{
- B_DB *mdb;
+ B_DB *mdb = NULL;
if (!db_user) {
Jmsg(jcr, M_FATAL, 0, _("A user name for PostgreSQL must be supplied.\n"));
return NULL;
}
P(mutex); /* lock DB queue */
+ if (db_list == NULL) {
+ db_list = New(dlist(mdb, &mdb->link));
+ }
if (!mult_db_connections) {
/* Look to see if DB already open */
- for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
+ foreach_dlist(mdb, db_list) {
if (bstrcmp(mdb->db_name, db_name) &&
bstrcmp(mdb->db_address, db_address) &&
mdb->db_port == db_port) {
mdb->db_socket = bstrdup(db_socket);
}
mdb->db_port = db_port;
- 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 */
mdb->esc_name = get_pool_memory(PM_FNAME);
mdb->esc_path = get_pool_memory(PM_FNAME);
mdb->allow_transactions = mult_db_connections;
- qinsert(&db_list, &mdb->bq); /* put db in list */
+ db_list->append(mdb); /* put db in list */
V(mutex);
return mdb;
}
+/* Check that the database correspond to the encoding we want */
+static bool check_database_encoding(JCR *jcr, B_DB *mdb)
+{
+ SQL_ROW row;
+ int ret=false;
+
+ if (!db_sql_query(mdb, "SELECT getdatabaseencoding()", NULL, NULL)) {
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ return false;
+ }
+
+ if ((row = sql_fetch_row(mdb)) == NULL) {
+ Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb));
+ Jmsg(jcr, M_ERROR, 0, "Can't check database encoding %s", mdb->errmsg);
+ } else {
+ ret = bstrcmp(row[0], "SQL_ASCII");
+
+ if (ret) {
+ /* if we are in SQL_ASCII, we can force the client_encoding to SQL_ASCII too */
+ db_sql_query(mdb, "SET client_encoding TO 'SQL_ASCII'", NULL, NULL);
+
+ } else { /* something is wrong with database encoding */
+ Mmsg(mdb->errmsg,
+ _("Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n"),
+ mdb->db_name, row[0]);
+ Jmsg(jcr, M_WARNING, 0, "%s", mdb->errmsg);
+ Dmsg1(50, "%s", mdb->errmsg);
+ }
+ }
+ return ret;
+}
+
/*
* Now actually open the database. This can generate errors,
* which are returned in the errmsg
int errstat;
char buf[10], *port;
-#ifdef xxx
- if (!PQisthreadsafe()) {
- Jmsg(jcr, M_ABORT, 0, _("PostgreSQL configuration problem. "
- "PostgreSQL library is not thread safe. Connot continue.\n"));
- }
-#endif
P(mutex);
if (mdb->connected) {
V(mutex);
mdb->db_password==NULL?"(NULL)":mdb->db_password);
if (PQstatus(mdb->db) != CONNECTION_OK) {
- Mmsg2(&mdb->errmsg, _("Unable to connect to PostgreSQL server.\n"
- "Database=%s User=%s\n"
- "It is probably not running or your password is incorrect.\n"),
- mdb->db_name, mdb->db_user);
+ Mmsg2(&mdb->errmsg, _("Unable to connect to PostgreSQL server. Database=%s User=%s\n"
+ "Possible causes: SQL server not running; password incorrect; max_connections exceeded.\n"),
+ mdb->db_name, mdb->db_user);
V(mutex);
return 0;
}
*/
sql_query(mdb, "set standard_conforming_strings=on");
+ /* check that encoding is SQL_ASCII */
+ check_database_encoding(jcr, mdb);
+
V(mutex);
return 1;
}
sql_free_result(mdb);
mdb->ref_count--;
if (mdb->ref_count == 0) {
- qdchain(&mdb->bq);
+ db_list->remove(mdb);
if (mdb->connected && mdb->db) {
sql_close(mdb);
}
free(mdb->db_socket);
}
free(mdb);
+ if (db_list->size() == 0) {
+ delete db_list;
+ db_list = NULL;
+ }
}
V(mutex);
}
+void db_check_backend_thread_safe()
+{
+#ifdef HAVE_BATCH_FILE_INSERT
+# ifdef HAVE_PQISTHREADSAFE
+ if (!PQisthreadsafe()) {
+ Emsg0(M_ABORT, 0, _("Pg client library must be thread-safe "
+ "when using BatchMode.\n"));
+ }
+# endif
+#endif
+}
+
void db_thread_cleanup()
{ }
}
// if still within the result set
- if (mdb->row_number < mdb->num_rows) {
+ if (mdb->row_number >= 0 && mdb->row_number < mdb->num_rows) {
Dmsg2(500, "my_postgresql_fetch_row row number '%d' is acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
// get each value from this row
for (j = 0; j < mdb->num_fields; j++) {
mdb->num_rows = PQntuples(mdb->result);
Dmsg1(500, "we have %d rows\n", mdb->num_rows);
- mdb->status = 0; /* succeed */
+ mdb->row_number = 0; /* we can start to fetch something */
+ mdb->status = 0; /* succeed */
} else {
Dmsg1(50, "Result status failed: %s\n", query);
goto bail_out;
db_unlock(mdb);
}
-int my_postgresql_currval(B_DB *mdb, char *table_name)
+static int my_postgresql_currval(B_DB *mdb, const char *table_name)
{
// Obtain the current value of the sequence that
// provides the serial value for primary key of the table.
return id;
}
+int my_postgresql_insert_autokey_record(B_DB *mdb, const char *query, const char *table_name)
+{
+ /*
+ * First execute the insert query and then retrieve the currval.
+ */
+ if (my_postgresql_query(mdb, query)) {
+ return 0;
+ }
+
+ mdb->num_rows = sql_affected_rows(mdb);
+ if (mdb->num_rows != 1) {
+ return 0;
+ }
+
+ mdb->changes++;
+
+ return my_postgresql_currval(mdb, table_name);
+}
+
#ifdef HAVE_BATCH_FILE_INSERT
int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
{
- char *query = "COPY batch FROM STDIN";
+ const char *query = "COPY batch FROM STDIN";
Dmsg0(500, "my_postgresql_batch_start started\n");
{
int res;
int count=30;
+ PGresult *result;
Dmsg0(500, "my_postgresql_batch_end started\n");
if (!mdb) { /* no files ? */
mdb->status = 0;
Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
}
-
+
+ /* Check command status and return to normal libpq state */
+ result = PQgetResult(mdb->db);
+ if (PQresultStatus(result) != PGRES_COMMAND_OK) {
+ Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
+ mdb->status = 0;
+ }
+ PQclear(result);
+
Dmsg0(500, "my_postgresql_batch_end finishing\n");
return mdb->status;
int res;
int count=30;
size_t len;
- char *digest;
+ const char *digest;
char ed1[50];
mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1);
if (res <= 0) {
Dmsg0(500, "we failed\n");
mdb->status = 0;
- Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
+ Mmsg1(&mdb->errmsg, _("error copying in batch mode: %s"), PQerrorMessage(mdb->db));
}
Dmsg0(500, "my_postgresql_batch_insert finishing\n");
projects / bacula / bacula / blobdiff