aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-01-1815-18/+112
|\
| * Bump up the year in MIT license filesPratik Naik2009-01-182-2/+2
| * Fix has_and_belongs_to_many_associations tests. #1738Pratik Naik2009-01-182-3/+3
| * Cache columns for has_and_belongs_to_many associationslukeludwig2009-01-173-3/+28
| * Fix dirty handling of nullable non-integer numeric columns [#1692 state:resol...Carlos Kozuszko2009-01-162-0/+25
| * Make belongs_to :dependent => :destroy destroy self before associated object...Ben VandenBos2009-01-162-3/+4
| * Fix the AR json serialization tests to comply with the earlier change to quot...Michael Koziarski2009-01-161-1/+1
| * Fixed broken after_save callback; was being called when before_create was can...Michael Lovitt2009-01-163-5/+48
| * Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns...Carlos Kozuszko2009-01-162-3/+3
* | revised rdoc of class_of_active_record_descendantXavier Noria2009-01-151-1/+2
* | Merge commit 'mainstream/master'Pratik Naik2009-01-1411-87/+421
|\|
| * Fix PostgreSQL unit test failures that only occur when using the old 'postgre...Hongli Lai (Phusion)2009-01-133-12/+13
| * Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 state...Cody Fauser2009-01-131-5/+0
| * Introduce transaction_joinable flag to mark that the fixtures transaction can...Jeremy Kemper2009-01-106-47/+45
| * Merge branch 'master' into savepointsJeremy Kemper2009-01-1047-729/+1585
| |\
| * \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0910-32/+88
| |\ \
| * \ \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0349-481/+631
| |\ \ \
| * | | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.Hongli Lai (Phusion)2008-11-033-2/+62
| * | | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve docum...Hongli Lai (Phusion)2008-11-032-7/+62
| * | | | Make SQLite3 pass the unit tests for savepoints.Hongli Lai (Phusion)2008-11-034-4/+18
| * | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in tra...Hongli Lai (Phusion)2008-11-032-2/+1
| * | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking activi...Hongli Lai (Phusion)2008-11-031-38/+0
| * | | | Fix the final MySQL unit test failure that's related to savepoint support.Hongli Lai (Phusion)2008-11-031-28/+39
| * | | | Improve documentation for DatabaseStatements#transactions and AbstractAdapter...Hongli Lai (Phusion)2008-11-033-6/+74
| * | | | Fix assert_queries failures by ignoring savepoint sql.Jonathan Viney2008-11-031-1/+1
| * | | | Fix what looks like a Mysql bug with transactions, savepoints, and create table.Jonathan Viney2008-11-031-21/+26
| * | | | Implement savepoints.Jonathan Viney2008-11-037-14/+185
* | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the adje...Chris Kampmeier2009-01-114-7/+7
* | | | | A little copyediting of 73db43527d162fdf95665d88589f7ab6d17a17faChris Kampmeier2009-01-111-4/+5
* | | | | Add better docs for ActiveRecord::Base#attribute_for_inspectChris Kampmeier2009-01-111-1/+12
* | | | | Minor changes to AR#delete/destroy docsPratik Naik2009-01-101-2/+2
* | | | | Merge commit 'mainstream/master'Pratik Naik2009-01-1011-10/+124
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge commit 'fred/pullable'Pratik Naik2008-12-305-5/+47
| |\ \ \ \
| | * | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | * | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 state:r...Roman Shterenzon2008-12-272-1/+10
| | * | | | Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-262-1/+17
| | * | | | Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-263-2/+19
| * | | | | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2008-12-301-1/+1
| * | | | | Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_tra...Mike Gunderloy2008-12-301-0/+4
| * | | | | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-287-68/+116
| |\ \ \ \ \
| * | | | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods like...Yaroslav Markin2008-12-285-1/+72
* | | | | | | Rewrite ActiveRecord::Base#destroy_all docs to remove incorrect info, mention...Chris Kampmeier2009-01-061-13/+20
* | | | | | | document edge cases in AR calculations, and wrap some commentsXavier Noria2008-12-301-8/+16
* | | | | | | Rewrite ActiveRecord::Base#delete docs to remove false information about call...Chris Kampmeier2008-12-291-7/+9
* | | | | | | Made code segments and method names have fixed-width fontsDaniel Schierbeck2008-12-291-8/+9
* | | | | | | Merge commit 'mainstream/master'Pratik Naik2008-12-2815-88/+188
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-287-68/+116
| |/ / / / /
| * | | | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed]Yaroslav Markin2008-12-271-1/+1
| * | | | | ActiveRecord::Base#new_record? now returns false for existing records (was ni...Yaroslav Markin2008-12-273-2/+9
| |/ / / /
| * | | | Preload uses exclusive scope [#643 state:resolved]Frederick Cheung2008-12-265-16/+53