diff options
| author | Cody Fauser <cody@jadedpixel.com> | 2008-05-14 09:11:35 -0400 |
|---|---|---|
| committer | Cody Fauser <cody@jadedpixel.com> | 2008-05-14 09:11:35 -0400 |
| commit | 9226b3e8355e7b6aa3be62fff56117d75c408831 (patch) | |
| tree | 2952484a50583e4c438d0abb37ff549e6c9811dc /activerecord/CHANGELOG | |
| parent | b8c46c86f0b785f6afc3c58eeb1b347543f5901e (diff) | |
| parent | 9546ee299952c86329c4854f9b3776382c0575ff (diff) | |
| download | rails-9226b3e8355e7b6aa3be62fff56117d75c408831.tar.gz rails-9226b3e8355e7b6aa3be62fff56117d75c408831.tar.bz2 rails-9226b3e8355e7b6aa3be62fff56117d75c408831.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 597b876f22..4a130bf5c0 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,9 @@ *SVN* +* Ensure hm:t preloading honours reflection options. Resolves #137. [Frederick Cheung] + +* Added protection against duplicate migration names (Aslak Hellesøy) [#112] + * Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true [Geoff Buesing] * Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. [Scott Fleckenstein, Geoff Buesing] @@ -8,7 +12,7 @@ change_table :videos do |t| t.timestamps # adds created_at, updated_at - t.belongs_to :goat # add goat_id integer + t.belongs_to :goat # adds goat_id integer t.string :name, :email, :limit => 20 # adds name and email both with a 20 char limit t.remove :name, :email # removes the name and email columns end |