diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-05 01:42:13 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-05 01:42:13 +0200 |
| commit | 289b5253ce476410ff78a5f55248c5a4e6a60223 (patch) | |
| tree | 3bf8b5a29c24a0e1afe27e1e3a446459adbf27b5 /activerecord | |
| parent | 892c99ca5cfc8b9ea1a06066f23bec847838f7f8 (diff) | |
| parent | 254a1e57d79143f21af74e1aa289ba546b3be821 (diff) | |
| download | rails-289b5253ce476410ff78a5f55248c5a4e6a60223.tar.gz rails-289b5253ce476410ff78a5f55248c5a4e6a60223.tar.bz2 rails-289b5253ce476410ff78a5f55248c5a4e6a60223.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 10 | ||||
| -rw-r--r-- | activerecord/lib/active_record/migration/command_recorder.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 3d1bc5c1e0..c459846264 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -66,9 +66,9 @@ module ActiveRecord # create_table :system_settings do |t| # t.string :name # t.string :label - # t.text :value + # t.text :value # t.string :type - # t.integer :position + # t.integer :position # end # # SystemSetting.create :name => "notice", @@ -181,7 +181,7 @@ module ActiveRecord # # class RemoveEmptyTags < ActiveRecord::Migration # def up - # Tag.find(:all).each { |tag| tag.destroy if tag.pages.empty? } + # Tag.all.each { |tag| tag.destroy if tag.pages.empty? } # end # # def down @@ -227,7 +227,7 @@ module ActiveRecord # def up # add_column :people, :salary, :integer # Person.reset_column_information - # Person.find(:all).each do |p| + # Person.all.each do |p| # p.update_attribute :salary, SalaryCalculator.compute(p) # end # end @@ -247,7 +247,7 @@ module ActiveRecord # def up # ... # say_with_time "Updating salaries..." do - # Person.find(:all).each do |p| + # Person.all.each do |p| # p.update_attribute :salary, SalaryCalculator.compute(p) # end # end diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb index 311789aa7f..2eeff7e36f 100644 --- a/activerecord/lib/active_record/migration/command_recorder.rb +++ b/activerecord/lib/active_record/migration/command_recorder.rb @@ -6,7 +6,7 @@ module ActiveRecord # # * add_column # * add_index - # * add_timestamp + # * add_timestamps # * create_table # * remove_timestamps # * rename_column |