diff options
Diffstat (limited to 'activerecord/lib/rails/generators/active_record.rb')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb index 5d8a8e81bc..4b3d1db216 100644 --- a/activerecord/lib/rails/generators/active_record.rb +++ b/activerecord/lib/rails/generators/active_record.rb @@ -1,12 +1,14 @@ 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 @@ -16,11 +18,7 @@ module ActiveRecord # Implement the required interface for Rails::Generators::Migration. def self.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 + ActiveRecord::Migration.next_migration_number(next_migration_number) end end end |