diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/commands.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9b00304cb9..6a6561a25c 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed incorrect migration number if script/generate executed outside of Rails root #7080 [jeremymcanally] + * Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0. [sam, madrobby] * Generated fixtures use the actual primary key instead of id. #4343 [Frederick Ros, Tarmo Tänav] diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index b541c6f65d..98531d9771 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -70,7 +70,7 @@ module Rails end def current_migration_number - Dir.glob("#{@migration_directory}/[0-9]*.rb").inject(0) do |max, file_path| + Dir.glob("#{RAILS_ROOT}/#{@migration_directory}/[0-9]*_*.rb").inject(0) do |max, file_path| n = File.basename(file_path).split('_', 2).first.to_i if n > max then n else max end end |