From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 6 May 2014 12:35:33 +0000 (+0200)
Subject: SONAR-5249 Fix migration on SQL Server
X-Git-Tag: 4.4-RC1~1190
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b097b3fbe1455887febecdb6ad33c7c1a2cb676;p=sonarqube.git

SONAR-5249 Fix migration on SQL Server
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb
index 0500c775f54..73e6bc7cdad 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb
@@ -30,6 +30,8 @@ class MergeMeasureDataIntoProjectMeasures < ActiveRecord::Migration
   def self.up
     unless ProjectMeasure.column_names.include?('measure_data')
       add_column :project_measures, 'measure_data', :binary, :null => true
+      # Required for MSSQL to unlock the table PROJECT_MEASURES
+      ActiveRecord::Base.connection.commit_db_transaction
     end
     ProjectMeasure.reset_column_information
     Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v44.MeasureDataMigration')