diff options
| author | José Valim <jose.valim@gmail.com> | 2012-02-23 05:47:16 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-02-23 05:47:16 -0800 |
| commit | af988ef5b07cc18bc706e741c6a99652faaf00b4 (patch) | |
| tree | acadb7ebad4a02f787091325c2423e8975f90126 | |
| parent | 5093915aaea497f6da32243bb22839cad7d20a8e (diff) | |
| parent | 846a9bcae8ac86639c4f569451bb2750bd4c24fc (diff) | |
| download | rails-af988ef5b07cc18bc706e741c6a99652faaf00b4.tar.gz rails-af988ef5b07cc18bc706e741c6a99652faaf00b4.tar.bz2 rails-af988ef5b07cc18bc706e741c6a99652faaf00b4.zip | |
Merge pull request #5139 from mhfs/remove_next_migration_number
Remove unused implementation of next_migration_number
| -rw-r--r-- | activerecord/lib/rails/generators/active_record.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration.rb | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb index 4b3d1db216..297cd094c2 100644 --- a/activerecord/lib/rails/generators/active_record.rb +++ b/activerecord/lib/rails/generators/active_record.rb @@ -1,14 +1,12 @@ require 'rails/generators/named_base' require 'rails/generators/migration' require 'rails/generators/active_model' -require 'rails/generators/active_record/migration' require 'active_record' module ActiveRecord module Generators class Base < Rails::Generators::NamedBase #:nodoc: include Rails::Generators::Migration - extend ActiveRecord::Generators::Migration # Set the current directory as base for the inherited generators. def self.base_root diff --git a/activerecord/lib/rails/generators/active_record/migration.rb b/activerecord/lib/rails/generators/active_record/migration.rb deleted file mode 100644 index 7f2f2e06a5..0000000000 --- a/activerecord/lib/rails/generators/active_record/migration.rb +++ /dev/null @@ -1,15 +0,0 @@ -module ActiveRecord - module Generators - module Migration - # Implement the required interface for Rails::Generators::Migration. - def next_migration_number(dirname) #:nodoc: - next_migration_number = current_migration_number(dirname) + 1 - if ActiveRecord::Base.timestamped_migrations - [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max - else - "%.3d" % next_migration_number - end - end - end - end -end |