diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
| commit | 7976b6d3069d18aa4279921e15d90ef13197fd78 (patch) | |
| tree | eed9a5c51c002f0864a2148b172c5238989e2eaa /activerecord/lib | |
| parent | 67597e1719ec6af7e22964603cc77aa5b085a864 (diff) | |
| parent | e889a226fe8985a3403fea3e2f90ca75b52b8f17 (diff) | |
| download | rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.gz rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.bz2 rails-7976b6d3069d18aa4279921e15d90ef13197fd78.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/migration/command_recorder.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 0c50826c63..90b8a29869 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -947,7 +947,7 @@ module ActiveRecord def migrations_paths @migrations_paths ||= ['db/migrate'] - # just to not break things if someone uses: migration_path = some_string + # just to not break things if someone uses: migrations_path = some_string Array(@migrations_paths) end diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb index 4c4afb4dbd..0fa665c7e0 100644 --- a/activerecord/lib/active_record/migration/command_recorder.rb +++ b/activerecord/lib/active_record/migration/command_recorder.rb @@ -9,6 +9,7 @@ module ActiveRecord # * add_index # * add_reference # * add_timestamps + # * change_column # * change_column_default (must supply a :from and :to option) # * change_column_null # * create_join_table @@ -18,6 +19,7 @@ module ActiveRecord # * drop_table (must supply a block) # * enable_extension # * remove_column (must supply a type) + # * remove_columns (must specify at least one column name or more) # * remove_foreign_key (must supply a second table) # * remove_index # * remove_reference |