From 2d4fe31af6c203482a48c147743b3a53ae0b99c3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 21 Sep 2005 13:27:45 +0000 Subject: [PATCH] Fixed migrations for Windows when using more than 10 [David Naseby] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2285 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record/migration.rb | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 5b8657fa89a29..15f6816f7538a 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed migrations for Windows when using more than 10 [David Naseby] + * Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 [Florian Weber] * Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Luetke] diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index a772dce55a9cb..587fbf852d729 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -207,10 +207,12 @@ def migration_classes end def migration_files - files = Dir["#{@migrations_path}/[0-9]*_*.rb"].sort + files = Dir["#{@migrations_path}/[0-9]*_*.rb"].sort_by do |f| + migration_version_and_name(f).first.to_i + end down? ? files.reverse : files end - + def migration_class(migration_name) migration_name.camelize.constantize end