IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change parameter of save_may_clobber_data from QofBackend to dbi_conn.

Browse Source 
It actually needs the dbi_conn and that's known to its caller. Plus,
the backend's conn parameter hasn't actually been set so it was somewhat
coincidental that it worked.
This commit is contained in:
John Ralls 2016-07-28 09:18:25 -07:00
parent fc47b63265
commit 00e0a6e8b6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/dbi/gnc-backend-dbi.cpp
View File

@ -115,7 +115,7 @@ constexpr const char* PGSQL_TIMESPEC_STR_FORMAT = "%04d%02d%02d %02d%02d%02d";
static void adjust_sql_options (dbi_conn connection); static void adjust_sql_options (dbi_conn connection);
static gboolean gnc_dbi_lock_database (QofBackend*, dbi_conn, gboolean); static gboolean gnc_dbi_lock_database (QofBackend*, dbi_conn, gboolean);
static gboolean save_may_clobber_data (QofBackend* qbe); static bool save_may_clobber_data (dbi_conn conn);
static void init_sql_backend (GncDbiBackend* dbi_be); static void init_sql_backend (GncDbiBackend* dbi_be);
static bool conn_test_dbi_library (dbi_conn conn, QofBackend* qbe); static bool conn_test_dbi_library (dbi_conn conn, QofBackend* qbe);
@ -788,7 +788,7 @@ gnc_dbi_session_begin<DbType::DBI_MYSQL> (QofBackend* qbe, QofSession* session,
LEAVE("Error"); LEAVE("Error");
return; return;
} }
if (create && !force && save_may_clobber_data (qbe)) if (create && !force && save_may_clobber_data (conn))
{ {
qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS); qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS);
PWARN ("Databse already exists, Might clobber it."); PWARN ("Databse already exists, Might clobber it.");
@ -948,7 +948,7 @@ gnc_dbi_session_begin<DbType::DBI_PGSQL> (QofBackend* qbe, QofSession* session,
LEAVE("Error"); LEAVE("Error");
return; return;
} }
if (create && !force && save_may_clobber_data (qbe)) if (create && !force && save_may_clobber_data(conn))
{ {
qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS); qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS);
PWARN ("Databse already exists, Might clobber it."); PWARN ("Databse already exists, Might clobber it.");
@ -1106,17 +1106,14 @@ gnc_dbi_load (QofBackend* qbe, QofBook* book, QofBackendLoadType loadType)
/* ================================================================= */ /* ================================================================= */
static gboolean static bool
save_may_clobber_data (QofBackend* qbe) save_may_clobber_data (dbi_conn conn)
{ {
GncDbiBackend* be = (GncDbiBackend*)qbe;
const gchar* dbname;
dbi_result result;
gboolean retval = FALSE;
/* Data may be clobbered iff the number of tables != 0 */ /* Data may be clobbered iff the number of tables != 0 */
dbname = dbi_conn_get_option (be->conn(), "dbname"); auto dbname = dbi_conn_get_option (conn, "dbname");
result = dbi_conn_get_table_list (be->conn(), dbname, nullptr); auto result = dbi_conn_get_table_list (conn, dbname, nullptr);
bool retval = false;
if (result) if (result)
{ {
retval = dbi_result_get_numrows (result) > 0; retval = dbi_result_get_numrows (result) > 0;

2
src/backend/dbi/gnc-backend-dbi.hpp
View File

@ -97,8 +97,6 @@ public:
{ {
m_conn->retry_connection(msg); m_conn->retry_connection(msg);
} }
/* Worst of all: */
GncSqlConnection* conn() { return m_conn; }
/*-----*/ /*-----*/
bool exists() { return m_exists; } bool exists() { return m_exists; }
void set_exists(bool exists) { m_exists = exists; } void set_exists(bool exists) { m_exists = exists; }