# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531567111 -7200
# Node ID 173176f8cef2fe24235e393afbacb67e22ae14dc
# Parent  19eec364236b02b1ca62d841860cb889ea455c01
jobs branch has disappeared in orthanc

diff -r 19eec364236b -r 173176f8cef2 Framework/Plugins/IndexUnitTests.h
--- a/Framework/Plugins/IndexUnitTests.h	Thu Jul 12 21:26:08 2018 +0200
+++ b/Framework/Plugins/IndexUnitTests.h	Sat Jul 14 13:18:31 2018 +0200
@@ -144,7 +144,6 @@
 
   db.RegisterOutput(new OrthancPlugins::DatabaseBackendOutput(&context, NULL));
   db.Open();
-  db.StartTransaction();
   
 
   std::string s;
@@ -381,7 +380,16 @@
 
   ASSERT_EQ(0u, db.GetUnprotectedPatientsCount());  // No patient was inserted
   ASSERT_TRUE(db.IsExistingResource(c));
-  db.DeleteResource(c);
+
+  {
+    // A transaction is needed here for MySQL, as it was not possible
+    // to implement recursive deletion of resources using pure SQL
+    // statements
+    db.StartTransaction();    
+    db.DeleteResource(c);
+    db.CommitTransaction();
+  }
+  
   ASSERT_FALSE(db.IsExistingResource(c));
   ASSERT_TRUE(db.IsExistingResource(a));
   ASSERT_TRUE(db.IsExistingResource(b));
@@ -415,6 +423,4 @@
   db.DeleteResource(p2);
   ASSERT_TRUE(db.SelectPatientToRecycle(r, p3));
   ASSERT_EQ(p1, r);
-
-  db.CommitTransaction();
 }
diff -r 19eec364236b -r 173176f8cef2 MySQL/CMakeLists.txt
--- a/MySQL/CMakeLists.txt	Thu Jul 12 21:26:08 2018 +0200
+++ b/MySQL/CMakeLists.txt	Sat Jul 14 13:18:31 2018 +0200
@@ -6,9 +6,8 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
-  set(ORTHANC_FRAMEWORK_BRANCH "jobs")  # TODO remove this
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
+  set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 19eec364236b -r 173176f8cef2 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Thu Jul 12 21:26:08 2018 +0200
+++ b/PostgreSQL/CMakeLists.txt	Sat Jul 14 13:18:31 2018 +0200
@@ -6,9 +6,8 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
-  set(ORTHANC_FRAMEWORK_BRANCH "jobs")  # TODO remove this
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
+  set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 19eec364236b -r 173176f8cef2 SQLite/CMakeLists.txt
--- a/SQLite/CMakeLists.txt	Thu Jul 12 21:26:08 2018 +0200
+++ b/SQLite/CMakeLists.txt	Sat Jul 14 13:18:31 2018 +0200
@@ -6,9 +6,8 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
-  set(ORTHANC_FRAMEWORK_BRANCH "jobs")  # TODO remove this
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
+  set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()