diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index b03594bb44..0d0ae92682 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that using version-targetted migrates would fail on loggers other than the default one #7430 [valeksenko] + * Fixed rename_column for SQLite when using symbols for the column names #8616 [drodriguez] * Added the possibility of using symbols in addition to concrete classes with ActiveRecord::Observer#observe #3998 [robbyrussell/tarmo] diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 2bec244263..b6213f4e1d 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -330,7 +330,11 @@ module ActiveRecord def migrate migration_classes.each do |migration_class| - Base.logger.info("Reached target version: #{@target_version}") and break if reached_target_version?(migration_class.version) + if reached_target_version?(migration_class.version) + Base.logger.info("Reached target version: #{@target_version}") + break + end + next if irrelevant_migration?(migration_class.version) Base.logger.info "Migrating to #{migration_class} (#{migration_class.version})" |