From c53eb532c2545fd26a72e5d6ac2883d410584cc7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Dec 2014 07:27:53 +0000 Subject: [PATCH] Plugin migration confuses two plugins with similar names (#18685). git-svn-id: http://svn.redmine.org/redmine/trunk@13768 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/plugin.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 0b0712072..769eaefc2 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -478,7 +478,7 @@ module Redmine #:nodoc: # Delete migrations that don't match .. to_i will work because the number comes first ::ActiveRecord::Base.connection.select_values( "SELECT version FROM #{schema_migrations_table_name}" - ).delete_if{ |v| v.match(/-#{plugin.id}/) == nil }.map(&:to_i).max || 0 + ).delete_if{ |v| v.match(/-#{plugin.id}$/) == nil }.map(&:to_i).max || 0 end end @@ -486,7 +486,7 @@ module Redmine #:nodoc: sm_table = self.class.schema_migrations_table_name ::ActiveRecord::Base.connection.select_values( "SELECT version FROM #{sm_table}" - ).delete_if{ |v| v.match(/-#{current_plugin.id}/) == nil }.map(&:to_i).sort + ).delete_if{ |v| v.match(/-#{current_plugin.id}$/) == nil }.map(&:to_i).sort end def record_version_state_after_migrating(version)