# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1625131876 -7200
# Node ID 86265ef5f3e3c0c16cf72bcb45af9ab7e6a71282
# Parent  024ec14b9121bbfdb5a16fbdf9528a493c677740
fix

diff -r 024ec14b9121 -r 86265ef5f3e3 Framework/Common/DatabaseManager.cpp
--- a/Framework/Common/DatabaseManager.cpp	Wed Jun 30 10:33:32 2021 +0200
+++ b/Framework/Common/DatabaseManager.cpp	Thu Jul 01 11:31:16 2021 +0200
@@ -24,7 +24,6 @@
 #include "Integer64Value.h"
 #include "BinaryStringValue.h"
 #include "Utf8StringValue.h"
-#include "../../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
@@ -61,16 +60,8 @@
     
   void DatabaseManager::CloseIfUnavailable(Orthanc::ErrorCode e)
   {
-    bool failure;
-
-#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 9, 2)
-    failure = (e != Orthanc::ErrorCode_Success &&
-               e != Orthanc::ErrorCode_DatabaseCannotSerialize);
-#else
-    failure = (e != Orthanc::ErrorCode_Success);
-#endif
-
-    if (failure)
+    if (e != Orthanc::ErrorCode_Success &&
+        e != Orthanc::ErrorCode_DatabaseCannotSerialize)
     {
       transaction_.reset(NULL);
     }
diff -r 024ec14b9121 -r 86265ef5f3e3 Framework/Common/DatabasesEnumerations.h
--- a/Framework/Common/DatabasesEnumerations.h	Wed Jun 30 10:33:32 2021 +0200
+++ b/Framework/Common/DatabasesEnumerations.h	Thu Jul 01 11:31:16 2021 +0200
@@ -39,6 +39,7 @@
     Dialect_MySQL,
     Dialect_PostgreSQL,
     Dialect_SQLite,
+    Dialect_MSSQL,
     Dialect_Unknown
   };
 
diff -r 024ec14b9121 -r 86265ef5f3e3 Framework/Common/GenericFormatter.cpp
--- a/Framework/Common/GenericFormatter.cpp	Wed Jun 30 10:33:32 2021 +0200
+++ b/Framework/Common/GenericFormatter.cpp	Thu Jul 01 11:31:16 2021 +0200
@@ -59,6 +59,7 @@
 
         case Dialect_MySQL:
         case Dialect_SQLite:
+        case Dialect_MSSQL:
           target = "?";
           break;