haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DbLib: Reconnect if connection is lost

This commit is contained in:
Jon Evans 2022-12-22 12:14:16 -05:00
parent cc2b107649
commit 66799b60f8
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/database/database_connection.cpp
View File

@ -348,6 +348,10 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
m_lastError = e.what(); m_lastError = e.what();
wxLogTrace( traceDatabase, wxT( "Exception while preparing statement for SelectOne: %s" ), wxLogTrace( traceDatabase, wxT( "Exception while preparing statement for SelectOne: %s" ),
m_lastError ); m_lastError );
// Exception may be due to a connection error; nanodbc won't auto-reconnect
m_conn->disconnect();
return false; return false;
} }
@ -365,6 +369,10 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
m_lastError = e.what(); m_lastError = e.what();
wxLogTrace( traceDatabase, wxT( "Exception while executing statement for SelectOne: %s" ), wxLogTrace( traceDatabase, wxT( "Exception while executing statement for SelectOne: %s" ),
m_lastError ); m_lastError );
// Exception may be due to a connection error; nanodbc won't auto-reconnect
m_conn->disconnect();
return false; return false;
} }
@ -434,6 +442,10 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, std::vector<ROW>
m_lastError = e.what(); m_lastError = e.what();
wxLogTrace( traceDatabase, wxT( "Exception while preparing query for SelectAll: %s" ), wxLogTrace( traceDatabase, wxT( "Exception while preparing query for SelectAll: %s" ),
m_lastError ); m_lastError );
// Exception may be due to a connection error; nanodbc won't auto-reconnect
m_conn->disconnect();
return false; return false;
} }
@ -448,6 +460,10 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, std::vector<ROW>
m_lastError = e.what(); m_lastError = e.what();
wxLogTrace( traceDatabase, wxT( "Exception while executing query for SelectAll: %s" ), wxLogTrace( traceDatabase, wxT( "Exception while executing query for SelectAll: %s" ),
m_lastError ); m_lastError );
// Exception may be due to a connection error; nanodbc won't auto-reconnect
m_conn->disconnect();
return false; return false;
} }

3
eeschema/sch_plugins/database/sch_database_plugin.cpp
View File

@ -251,6 +251,9 @@ void SCH_DATABASE_PLUGIN::ensureConnection()
{ {
wxCHECK_RET( m_settings, "Call ensureSettings before ensureConnection!" ); wxCHECK_RET( m_settings, "Call ensureSettings before ensureConnection!" );
if( m_conn && !m_conn->IsConnected() )
m_conn.reset();
if( !m_conn ) if( !m_conn )
{ {
if( m_settings->m_Source.connection_string.empty() ) if( m_settings->m_Source.connection_string.empty() )