From 24ec2501f751dc2a122f1e5f905ee4151ec8b891 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 20 Jun 2014 00:36:40 +0200 Subject: [PATCH] SONAR-5007 new helper in environment.rb for executing java migrations --- sonar-server/src/main/webapp/WEB-INF/config/environment.rb | 4 ++++ .../WEB-INF/db/migrate/401_migrate_violations_to_issues.rb | 2 +- .../webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb | 2 +- .../497_update_issue_message_by_rule_name_when_no_message.rb | 2 +- .../WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb | 2 +- .../db/migrate/514_update_issue_changelog_debt_to_minutes.rb | 2 +- .../WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb | 2 +- .../db/migrate/516_update_development_cost_to_minutes.rb | 2 +- .../WEB-INF/db/migrate/521_update_requirement_measures.rb | 2 +- .../525_update_not_resolved_issues_on_removed_components.rb | 2 +- .../migrate/530_merge_measure_data_into_project_measures.rb | 2 +- ...31_update_issues_action_plan_key_on_removed_action_plan.rb | 2 +- 12 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb index 2be3ada4e3a..12ea9ebd64a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb +++ b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb @@ -124,6 +124,10 @@ class ActiveRecord::Migration super(table_name, column_name, options) end + def self.execute_java_migration(classname) + Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration(classname) + end + def self.alter_to_big_primary_key(tablename) case dialect() when "postgre" diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb index 7dc57cbd362..cd749866220 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb @@ -32,7 +32,7 @@ class MigrateViolationsToIssues < ActiveRecord::Migration # Required for MSSQL to unlock the table RULE_FAILURES ActiveRecord::Base.connection.commit_db_transaction - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v36.ViolationMigration') + execute_java_migration('org.sonar.server.db.migrations.v36.ViolationMigration') # Currently not possible in Java because of Oracle (triggers and sequences must be dropped) drop_table('rule_failures') diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb index c23a3d4d3b3..52a1f86db9c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb @@ -25,7 +25,7 @@ class MigratePackageKeys < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v42.PackageKeysMigration') + execute_java_migration('org.sonar.server.db.migrations.v42.PackageKeysMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb index 39a1b1b7a0f..dd16ce162dc 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb @@ -25,6 +25,6 @@ class UpdateIssueMessageByRuleNameWhenNoMessage < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v42.CompleteIssueMessageMigration') + execute_java_migration('org.sonar.server.db.migrations.v42.CompleteIssueMessageMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb index 96a9ce3a080..c16795f2467 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb @@ -25,6 +25,6 @@ class ConvertIssueDebtToMinutes < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.ConvertIssueDebtToMinutesMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.ConvertIssueDebtToMinutesMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb index 8e69ff458b4..4e41841f68c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb @@ -25,6 +25,6 @@ class UpdateIssueChangelogDebtToMinutes < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.IssueChangelogMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.IssueChangelogMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb index 82d7563ea36..80e25fc954f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb @@ -25,6 +25,6 @@ class UpdateMeasuresDebtToMinutes < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.TechnicalDebtMeasuresMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.TechnicalDebtMeasuresMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb index 04798bce357..d3babd54cdb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb @@ -25,6 +25,6 @@ class UpdateDevelopmentCostToMinutes < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.DevelopmentCostMeasuresMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.DevelopmentCostMeasuresMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb index d9632e4e20b..9d287e17578 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb @@ -25,6 +25,6 @@ class UpdateRequirementMeasures < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.RequirementMeasuresMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.RequirementMeasuresMigration') end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb index df7f088f8ad..410a0bc8d20 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb @@ -25,7 +25,7 @@ class UpdateNotResolvedIssuesOnRemovedComponents < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.NotResolvedIssuesOnRemovedComponentsMigration') + execute_java_migration('org.sonar.server.db.migrations.v43.NotResolvedIssuesOnRemovedComponentsMigration') end end 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 73e6bc7cdad..80bd94722ca 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 @@ -34,7 +34,7 @@ class MergeMeasureDataIntoProjectMeasures < ActiveRecord::Migration ActiveRecord::Base.connection.commit_db_transaction end ProjectMeasure.reset_column_information - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v44.MeasureDataMigration') + execute_java_migration('org.sonar.server.db.migrations.v44.MeasureDataMigration') drop_table(:measure_data) end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb index a6859443e2a..0add6a21944 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb @@ -25,7 +25,7 @@ class UpdateIssuesActionPlanKeyOnRemovedActionPlan < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v44.IssueActionPlanKeyMigration') + execute_java_migration('org.sonar.server.db.migrations.v44.IssueActionPlanKeyMigration') end end -- 2.39.5