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

Fix test-backend-dbi for Postgress and MySQL.

Browse Source 
Pass MySQL database exists errors and skip creating the database
if it exists.
This commit is contained in:
John Ralls
2018-07-13 16:34:42 -07:00
parent c2972c75d0
commit de927d535d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,6 +531,12 @@ error_handler<DbType::DBI_MYSQL> (dbi_conn conn, void* user_data)
dbi_be->set_dbi_error (ERR_BACKEND_CANT_CONNECT, 1, true);
dbi_be->retry_connection (msg);
}
else if (err_num == 1007) //Database exists
{
dbi_be->set_exists(true);
return;
}
else // Any other error
{
PERR ("DBI error: %s\n", msg);
@@ -700,7 +706,8 @@ GncDbiBackend<Type>::session_begin (QofSession* session, const char* book_id,
if (create)
{
if (!create_database(conn, uri.quote_dbname(Type).c_str()))
if (!m_exists &&
!create_database(conn, uri.quote_dbname(Type).c_str()))
{
dbi_conn_close(conn);
LEAVE("Error");