Mercurial > hg > orthanc-databases

changeset 620:28fd73902e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@orthanc.team>
date Wed, 18 Dec 2024 12:29:54 +0100
parents a9a7dceeaad0 (current diff) 5a325e5aee51 (diff)
children f00417b34bbb
files
diffstat 7 files changed, 7 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Common/DatabaseManager.h	Wed Dec 18 12:22:00 2024 +0100
+++ b/Framework/Common/DatabaseManager.h	Wed Dec 18 12:29:54 2024 +0100
@@ -223,7 +223,7 @@
         Execute(parameters);
       }
 
-      virtual void Execute(const Dictionary& parameters);
+      virtual void Execute(const Dictionary& parameters) ORTHANC_OVERRIDE;
 
       void ExecuteWithoutResult()
       {
@@ -255,7 +255,7 @@
         Execute(parameters);
       }
 
-      virtual void Execute(const Dictionary& parameters);
+      virtual void Execute(const Dictionary& parameters) ORTHANC_OVERRIDE;
 
       void ExecuteWithoutResult()
       {
--- a/Framework/Plugins/IndexBackend.cpp	Wed Dec 18 12:22:00 2024 +0100
+++ b/Framework/Plugins/IndexBackend.cpp	Wed Dec 18 12:29:54 2024 +0100
@@ -2164,7 +2164,7 @@
     }
     
   public:
-    LookupFormatter(Dialect dialect) :
+    explicit LookupFormatter(Dialect dialect) :
       dialect_(dialect),
       count_(0)
     {
--- a/Framework/Plugins/IndexConnectionsPool.cpp	Wed Dec 18 12:22:00 2024 +0100
+++ b/Framework/Plugins/IndexConnectionsPool.cpp	Wed Dec 18 12:29:54 2024 +0100
@@ -55,10 +55,9 @@
     {
       if (boost::posix_time::second_clock::local_time() - lastInvocation >= that->housekeepingDelay_)
       {
-        Accessor accessor(*that);
-
         try
         {
+          Accessor accessor(*that);
           accessor.GetBackend().PerformDbHousekeeping(accessor.GetManager());
         }
         catch (Orthanc::OrthancException& e)
--- a/MySQL/Plugins/MySQLIndex.h	Wed Dec 18 12:22:00 2024 +0100
+++ b/MySQL/Plugins/MySQLIndex.h	Wed Dec 18 12:29:54 2024 +0100
@@ -35,7 +35,7 @@
     bool                   clearAll_;
 
   protected:
-    virtual bool HasChildCountTable() const
+    virtual bool HasChildCountTable() const ORTHANC_OVERRIDE
     {
       return false;
     }
--- a/Odbc/Plugins/OdbcIndex.h	Wed Dec 18 12:22:00 2024 +0100
+++ b/Odbc/Plugins/OdbcIndex.h	Wed Dec 18 12:29:54 2024 +0100
@@ -35,7 +35,7 @@
     std::string  connectionString_;
     
   protected:
-    virtual bool HasChildCountTable() const
+    virtual bool HasChildCountTable() const ORTHANC_OVERRIDE
     {
       return false;
     }
--- a/PostgreSQL/Plugins/PostgreSQLIndex.cpp	Wed Dec 18 12:22:00 2024 +0100
+++ b/PostgreSQL/Plugins/PostgreSQLIndex.cpp	Wed Dec 18 12:29:54 2024 +0100
@@ -549,11 +549,6 @@
   {
     std::string sql;
 
-    std::vector<std::string> resourceIds;
-    std::vector<std::string> groups;
-    std::vector<std::string> elements;
-    std::vector<std::string> values;
-
     Dictionary args;
     
     for (uint32_t i = 0; i < count; i++)
--- a/Resources/CMake/PostgreSQLConfiguration.cmake	Wed Dec 18 12:22:00 2024 +0100
+++ b/Resources/CMake/PostgreSQLConfiguration.cmake	Wed Dec 18 12:29:54 2024 +0100
@@ -442,7 +442,7 @@
 
 else()
   set(PostgreSQL_ADDITIONAL_VERSIONS
-    "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+    "17" "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
   if (NOT WIN32)
     foreach (suffix ${PostgreSQL_ADDITIONAL_VERSIONS})
       list(APPEND PostgreSQL_ADDITIONAL_SEARCH_PATHS