}
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;
* 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_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;
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 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 */