aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-12-15 17:47:28 +1030
committerMatthew Draper <matthew@trebex.net>2015-12-15 17:47:28 +1030
commitcd90f4f273071fd20ff6e4ce34c33171923733b4 (patch)
treef29f9a0aec8432846199ccd69e1f975b95321b4b /activerecord/lib/rails
parentde2135209f39a4d336916feceab972bc89dc93de (diff)
parent97c77160cd4c8b32a6572adefa268eb91162e3e1 (diff)
downloadrails-cd90f4f273071fd20ff6e4ce34c33171923733b4.tar.gz
rails-cd90f4f273071fd20ff6e4ce34c33171923733b4.tar.bz2
rails-cd90f4f273071fd20ff6e4ce34c33171923733b4.zip
Merge pull request #21538 from matthewd/migration-version
Add migration versioning via Migration subclasses
Diffstat (limited to 'activerecord/lib/rails')
-rw-r--r--activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb2
-rw-r--r--activerecord/lib/rails/generators/active_record/migration/templates/migration.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb
index fadab2a1e6..5f7201cfe1 100644
--- a/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb
@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
def change
create_table :<%= table_name %><%= primary_key_type %> do |t|
<% attributes.each do |attribute| -%>
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
index 23a377db6a..107f107dc4 100644
--- a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
<%- if migration_action == 'add' -%>
def change
<% attributes.each do |attribute| -%>