# HG changeset patch # User Sebastien Jodogne # Date 1551441373 -3600 # Node ID b1d7d255fb73448e0c82e21302e09e63358199c6 # Parent 90692f9c33e0d6e5c03636cc55b437d354ae2ec3# Parent 5c69c2a14c9703680df34ced9f6cb1a4c1e72dad back to mainline diff -r 90692f9c33e0 -r b1d7d255fb73 Framework/Plugins/GlobalProperties.cpp --- a/Framework/Plugins/GlobalProperties.cpp Fri Mar 01 11:21:42 2019 +0100 +++ b/Framework/Plugins/GlobalProperties.cpp Fri Mar 01 12:56:13 2019 +0100 @@ -115,6 +115,12 @@ Orthanc::GlobalProperty property, const std::string& utf8) { + // This version of "SetGlobalProperty()" (with an explicit + // transaction) is called internally by the plugin to set a global + // property during the initialization of the database. (TODO: + // Could be replaced by the version with an implicit transaction + // to avoid code redundancy). + if (db.GetDialect() == Dialect_SQLite) { Query query("INSERT OR REPLACE INTO GlobalProperties VALUES (${property}, ${value})", false); @@ -164,6 +170,11 @@ Orthanc::GlobalProperty property, const std::string& utf8) { + // This version of "SetGlobalProperty()" (without an explicit + // transaction) is called by Orthanc during its execution. Orthanc + // manages the transaction at a higher level, but this transaction + // is always present. + if (manager.GetDialect() == Dialect_SQLite) { DatabaseManager::CachedStatement statement( diff -r 90692f9c33e0 -r b1d7d255fb73 PostgreSQL/CMakeLists.txt diff -r 90692f9c33e0 -r b1d7d255fb73 PostgreSQL/NEWS --- a/PostgreSQL/NEWS Fri Mar 01 11:21:42 2019 +0100 +++ b/PostgreSQL/NEWS Fri Mar 01 12:56:13 2019 +0100 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Release 3.2 (2019-03-01) +======================== + * Explicit deallocation of prepared statements