diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-01-13 09:26:53 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-01-13 09:26:53 +0000 |
| commit | 30c6bd9b31098332d6357d3ab614941646cbe0e2 (patch) | |
| tree | ca342f12ce730db4e3a51b9aef65b44a4acc7efd | |
| parent | 302533b196a2ead2c1bd046b2d9df9cf4f861354 (diff) | |
| download | rails-30c6bd9b31098332d6357d3ab614941646cbe0e2.tar.gz rails-30c6bd9b31098332d6357d3ab614941646cbe0e2.tar.bz2 rails-30c6bd9b31098332d6357d3ab614941646cbe0e2.zip | |
Make migration generator only report on exact duplicate names, not partial dupliate names. Closes #3442.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3413 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -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 019f33aefc..eae7083fdd 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make migration generator only report on exact duplicate names, not partial dupliate names. #3442 [jeremy@planetargon.com Marcel Molina Jr.] + * Fix typo in mailer generator USAGE. #3458 [chriztian.steinmeier@gmail.com] * Ignore version mismatch between pg_dump and the database server. #3457 [simon.stapleton@gmail.com] diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 93d22ddef4..de6fefe093 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -61,7 +61,7 @@ module Rails end def existing_migrations(file_name) - Dir.glob("#{@migration_directory}/[0-9]*_#{file_name}.rb") + Dir.glob("#{@migration_directory}/[0-9]*_*.rb").grep(/[0-9]+_#{file_name}.rb$/) end def migration_exists?(file_name) |