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

Bug 796967 - gnclock table not removed when using PostgreSQL.

Browse Source 
Because of https://sourceforge.net/p/libdbi-drivers/bugs/24.
This issue causes trouble in save_may_clobber_data() as well, so
work around it by using a SQL query instead of dbi_conn_get_table_list.
This commit is contained in:
John Ralls 2018-12-28 13:16:41 -08:00
parent 267852ba76
commit 1116ce909b
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libgnucash/backend/dbi/gnc-backend-dbi.cpp
View File

@ -111,7 +111,8 @@ static QofLogModule log_module = G_LOG_DOMAIN;
#define PGSQL_DEFAULT_PORT 5432 #define PGSQL_DEFAULT_PORT 5432
static void adjust_sql_options (dbi_conn connection); static void adjust_sql_options (dbi_conn connection);
static bool save_may_clobber_data (dbi_conn conn, const std::string& dbname); template<DbType Type> bool save_may_clobber_data (dbi_conn conn,
const std::string& dbname);
template <DbType Type> template <DbType Type>
class QofDbiBackendProvider : public QofBackendProvider class QofDbiBackendProvider : public QofBackendProvider
@ -882,7 +883,7 @@ GncDbiBackend<Type>::load (QofBook* book, QofBackendLoadType loadType)
/* ================================================================= */ /* ================================================================= */
/* This is used too early to call GncDbiProvider::get_table_list(). */ /* This is used too early to call GncDbiProvider::get_table_list(). */
static bool template <DbType T> bool
save_may_clobber_data (dbi_conn conn, const std::string& dbname) save_may_clobber_data (dbi_conn conn, const std::string& dbname)
{ {
@ -897,6 +898,23 @@ save_may_clobber_data (dbi_conn conn, const std::string& dbname)
return retval; return retval;
} }
template <> bool
save_may_clobber_data <DbType::DBI_PGSQL>(dbi_conn conn,
const std::string& dbname)
{
/* Data may be clobbered iff the number of tables != 0 */
const char* query = "SELECT relname FROM pg_class WHERE relname !~ '^(pg|sql)_' AND relkind = 'r' ORDER BY relname";
auto result = dbi_conn_query (conn, query);
bool retval = false;
if (result)
{
retval = dbi_result_get_numrows (result) > 0;
dbi_result_free (result);
}
return retval;
}
/** /**
* Safely resave a database by renaming all of its tables, recreating * Safely resave a database by renaming all of its tables, recreating

37
libgnucash/backend/dbi/gnc-dbiproviderimpl.hpp
View File

@ -262,19 +262,30 @@ template<> StrVec
GncDbiProviderImpl<DbType::DBI_PGSQL>::get_table_list (dbi_conn conn, GncDbiProviderImpl<DbType::DBI_PGSQL>::get_table_list (dbi_conn conn,
const std::string& table) const std::string& table)
{ {
std::string dbname (dbi_conn_get_option (conn, "dbname")); const char* query_no_regex = "SELECT relname FROM pg_class WHERE relname"
auto list = conn_get_table_list (conn, dbname, table); "!~ '^(pg|sql)_' AND relkind = 'r' ORDER BY relname";
auto end = std::remove_if (list.begin(), list.end(), std::string query_with_regex = "SELECT relname FROM pg_class WHERE relname LIKE '";
[](std::string& table_name){ query_with_regex += table + "' AND relkind = 'r' ORDER BY relname";
return table_name == "sql_features" || dbi_result result;
table_name == "sql_implementation_info" || if (table.empty())
table_name == "sql_languages" || result = dbi_conn_query (conn, query_no_regex);
table_name == "sql_packages" || else
table_name == "sql_parts" || result = dbi_conn_query (conn, query_with_regex.c_str());
table_name == "sql_sizing" ||
table_name == "sql_sizing_profiles"; StrVec list;
}); const char* errmsg;
list.erase(end, list.end()); if (dbi_conn_error (conn, &errmsg) != DBI_ERROR_NONE)
{
PWARN ("Table List Retrieval Error: %s\n", errmsg);
return list;
}
while (dbi_result_next_row (result) != 0)
{
std::string index_name {dbi_result_get_string_idx (result, 1)};
list.push_back(index_name);
}
dbi_result_free (result);
return list; return list;
} }