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
#ifdef HAVE_POSTGRESQL
#include "postgres_ext.h" /* needed for NAMEDATALEN */
+#include "pg_config_manual.h" /* get NAMEDATALEN on version 8.3 or later */
/* -----------------------------------------------------------------------
*
}
sql_query(mdb, "SET datestyle TO 'ISO, YMD'");
+
+ /* tell PostgreSQL we are using standard conforming strings
+ and avoid warnings such as:
+ WARNING: nonstandard use of \\ in a string literal
+ */
+ sql_query(mdb, "set standard_conforming_strings=on");
V(mutex);
return 1;
if (mdb->db_socket) {
free(mdb->db_socket);
}
- my_postgresql_free_result(mdb);
free(mdb);
}
V(mutex);
* the escaped output.
*/
void
-db_escape_string(char *snew, char *old, int len)
+db_escape_string(JCR *jcr, B_DB *mdb, char *snew, char *old, int len)
{
- PQescapeString(snew, old, len);
+ int error;
+
+ PQescapeStringConn(mdb->db, snew, old, len, &error);
+ if (error) {
+ Jmsg(jcr, M_FATAL, 0, _("PQescapeStringConn returned non-zero.\n"));
+ /* error on encoding, probably invalid multibyte encoding in the source string
+ see PQescapeStringConn documentation for details. */
+ Dmsg0(500, "PQescapeStringConn failed\n");
+ }
}
/*
* 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, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+bool db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
{
SQL_ROW row;
Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
Dmsg0(500, "db_sql_query failed\n");
- return 0;
+ return false;
}
Dmsg0(500, "db_sql_query succeeded. checking handler\n");
Dmsg0(500, "db_sql_query finished\n");
- return 1;
+ return true;
}
Dmsg0(500, "my_postgresql_fetch_row start\n");
if (!mdb->row || mdb->row_size < mdb->num_fields) {
+ int num_fields = mdb->num_fields;
Dmsg1(500, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
if (mdb->row) {
Dmsg0(500, "my_postgresql_fetch_row freeing space\n");
free(mdb->row);
}
- mdb->row = (POSTGRESQL_ROW) malloc(sizeof(char *) * mdb->num_fields);
- mdb->row_size = mdb->num_fields;
+ num_fields += 20; /* add a bit extra */
+ mdb->row = (POSTGRESQL_ROW)malloc(sizeof(char *) * num_fields);
+ mdb->row_size = num_fields;
// now reset the row_number now that we have the space allocated
mdb->row_number = 0;
Dmsg2(500, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
}
- Dmsg1(500, "my_postgresql_fetch_row finishes returning %x\n", row);
+ Dmsg1(500, "my_postgresql_fetch_row finishes returning %p\n", row);
return row;
}
void my_postgresql_free_result(B_DB *mdb)
{
+
+ db_lock(mdb);
if (mdb->result) {
PQclear(mdb->result);
mdb->result = NULL;
free(mdb->fields);
mdb->fields = NULL;
}
+ db_unlock(mdb);
}
int my_postgresql_currval(B_DB *mdb, char *table_name)
return id;
}
+#ifdef HAVE_BATCH_FILE_INSERT
+
int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
{
char *query = "COPY batch FROM STDIN";
Dmsg0(500, "my_postgresql_batch_start started\n");
if (my_postgresql_query(mdb,
- " CREATE TEMPORARY TABLE batch "
- " (fileindex int, "
- " jobid int, "
- " path varchar, "
- " name varchar, "
- " lstat varchar, "
- " md5 varchar)") == 1)
+ "CREATE TEMPORARY TABLE batch ("
+ "fileindex int,"
+ "jobid int,"
+ "path varchar,"
+ "name varchar,"
+ "lstat varchar,"
+ "md5 varchar)") == 1)
{
Dmsg0(500, "my_postgresql_batch_start failed\n");
return 1;
mdb->row_number = -1;
mdb->field_number = -1;
- if (mdb->result != NULL) {
- my_postgresql_free_result(mdb);
- }
+ my_postgresql_free_result(mdb);
for (int i=0; i < 10; i++) {
mdb->result = PQexec(mdb->db, query);
return mdb->status;
bail_out:
+ Mmsg1(&mdb->errmsg, _("error starting batch mode: %s"), PQerrorMessage(mdb->db));
mdb->status = 0;
PQclear(mdb->result);
mdb->result = NULL;
if (res <= 0) {
Dmsg0(500, "we failed\n");
mdb->status = 0;
- Mmsg1(&mdb->errmsg, _("error ending batch mode: %s\n"), PQerrorMessage(mdb->db));
+ Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
}
Dmsg0(500, "my_postgresql_batch_end finishing\n");
if (res <= 0) {
Dmsg0(500, "we failed\n");
mdb->status = 0;
- Mmsg1(&mdb->errmsg, _("error ending batch mode: %s\n"), PQerrorMessage(mdb->db));
+ Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
}
Dmsg0(500, "my_postgresql_batch_insert finishing\n");
return mdb->status;
}
+#endif /* HAVE_BATCH_FILE_INSERT */
+
/*
* Escape strings so that PostgreSQL is happy on COPY
*
return dest;
}
-char *my_pg_batch_lock_path_query = "BEGIN; LOCK TABLE Path IN SHARE ROW EXCLUSIVE MODE";
+#ifdef HAVE_BATCH_FILE_INSERT
+const char *my_pg_batch_lock_path_query =
+ "BEGIN; LOCK TABLE Path IN SHARE ROW EXCLUSIVE MODE";
+
+const char *my_pg_batch_lock_filename_query =
+ "BEGIN; LOCK TABLE Filename IN SHARE ROW EXCLUSIVE MODE";
-char *my_pg_batch_lock_filename_query = "BEGIN; LOCK TABLE Filename IN SHARE ROW EXCLUSIVE MODE";
+const char *my_pg_batch_unlock_tables_query = "COMMIT";
-char *my_pg_batch_unlock_tables_query = "COMMIT";
+const char *my_pg_batch_fill_path_query =
+ "INSERT INTO Path (Path) "
+ "SELECT a.Path FROM "
+ "(SELECT DISTINCT Path FROM batch) AS a "
+ "WHERE NOT EXISTS (SELECT Path FROM Path WHERE Path = a.Path) ";
-char *my_pg_batch_fill_path_query = "INSERT INTO Path (Path) "
- " SELECT a.Path FROM "
- " (SELECT DISTINCT Path FROM batch) AS a "
- " WHERE NOT EXISTS (SELECT Path FROM Path WHERE Path = a.Path) ";
+const char *my_pg_batch_fill_filename_query =
+ "INSERT INTO Filename (Name) "
+ "SELECT a.Name FROM "
+ "(SELECT DISTINCT Name FROM batch) as a "
+ "WHERE NOT EXISTS "
+ "(SELECT Name FROM Filename WHERE Name = a.Name)";
+#endif /* HAVE_BATCH_FILE_INSERT */
-char *my_pg_batch_fill_filename_query = "INSERT INTO Filename (Name) "
- " SELECT a.Name FROM "
- " (SELECT DISTINCT Name FROM batch) as a "
- " WHERE NOT EXISTS "
- " (SELECT Name FROM Filename WHERE Name = a.Name)";
#endif /* HAVE_POSTGRESQL */
projects / bacula / bacula / blobdiff