diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 22:18:55 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 22:18:55 +0000 |
| commit | 766fbce04e9d24de36c9cb9cfe719f3814cedc11 (patch) | |
| tree | 70752365d8b3025f0256d98007bd5f4904539e1b /activerecord | |
| parent | 4cf23c9f8e78cea6c29ba083d9bc3fa5d4d2e32a (diff) | |
| download | rails-766fbce04e9d24de36c9cb9cfe719f3814cedc11.tar.gz rails-766fbce04e9d24de36c9cb9cfe719f3814cedc11.tar.bz2 rails-766fbce04e9d24de36c9cb9cfe719f3814cedc11.zip | |
Fixed that using version-targetted migrates would fail on loggers other than the default one (closes #7430) [valeksenko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -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})" |