# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1445009819 -7200
# Node ID a7745f3a2cc4db4aac3664c4727607e2118db1e9
# Parent  5ebd6cbb3da8ac14e0073b4a07ee41d96a77c5e1# Parent  d72cf0c11f422870bc88688f5a9a551fccc0b704
integration mainline->db-changes

diff -r 5ebd6cbb3da8 -r a7745f3a2cc4 OrthancServer/DatabaseWrapper.cpp
--- a/OrthancServer/DatabaseWrapper.cpp	Fri Oct 16 17:36:07 2015 +0200
+++ b/OrthancServer/DatabaseWrapper.cpp	Fri Oct 16 17:36:59 2015 +0200
@@ -360,10 +360,15 @@
     {
       LOG(WARNING) << "Upgrading database version from 5 to 6";
       // No change in the DB schema, the step from version 5 to 6 only
-      // consists in reconstructing the main DICOM tags information.
+      // consists in reconstructing the main DICOM tags information
+      // (as more tags got included).
       db_.BeginTransaction();
+      Toolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Patient);
       Toolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Study);
       Toolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Series);
+      Toolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Instance);
+      db_.Execute("UPDATE GlobalProperties SET value=\"6\" WHERE property=" +
+                  boost::lexical_cast<std::string>(GlobalProperty_DatabaseSchemaVersion) + ";");
       db_.CommitTransaction();
       version_ = 6;
     }