aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-01-186-10/+25
|\
| * Bump up the year in MIT license filesPratik Naik2009-01-181-1/+1
| |
| * Cache columns for has_and_belongs_to_many associationslukeludwig2009-01-172-3/+17
| | | | | | | | | | This avoids repeatedly calling SHOW COLUMNS when the association is queried [#1738 state:committed]
| * Make belongs_to :dependent => :destroy destroy self before associated ↵Ben VandenBos2009-01-161-2/+2
| | | | | | | | | | | | | | | | object [#1079 state:resolved] If foreign key constraints are in place then deleteing the associated object first will cause a foreign key violation Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Fixed broken after_save callback; was being called when before_create was ↵Michael Lovitt2009-01-161-2/+3
| | | | | | | | | | | | | | canceled or before_update was canceled Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1735 state:committed]
| * Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric ↵Carlos Kozuszko2009-01-161-2/+2
| | | | | | | | | | | | | | columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1692 state:committed]
* | revised rdoc of class_of_active_record_descendantXavier Noria2009-01-151-1/+2
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-01-147-59/+216
|\|
| * Fix PostgreSQL unit test failures that only occur when using the old ↵Hongli Lai (Phusion)2009-01-132-10/+12
| | | | | | | | | | | | | | | | 'postgres' driver. [#1748 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 ↵Cody Fauser2009-01-131-5/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Introduce transaction_joinable flag to mark that the fixtures transaction ↵Jeremy Kemper2009-01-104-43/+39
| | | | | | | | | | | | can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog. [#383 state:committed]
| * Merge branch 'master' into savepointsJeremy Kemper2009-01-1022-163/+667
| |\
| * \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-098-32/+74
| |\ \
| * \ \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0315-246/+290
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb
| * | | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.Hongli Lai (Phusion)2008-11-032-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed compatibility with the old 'postgres' driver which doesn't support transaction state introspection. - Added unit tests for it.
| * | | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve ↵Hongli Lai (Phusion)2008-11-031-2/+57
| | | | | | | | | | | | | | | | | | | | documentation for nested transactions.
| * | | | Make SQLite3 pass the unit tests for savepoints.Hongli Lai (Phusion)2008-11-033-0/+14
| | | | |
| * | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵Hongli Lai (Phusion)2008-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | transaction_test.
| * | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵Hongli Lai (Phusion)2008-11-031-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity ourselves" This commit conflicts with savepoint support. This reverts commit 045713ee240fff815edb5962b25d668512649478. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | | | Improve documentation for DatabaseStatements#transactions and ↵Hongli Lai (Phusion)2008-11-033-6/+74
| | | | | | | | | | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions.
| * | | | Implement savepoints.Jonathan Viney2008-11-036-14/+53
| | | | |
* | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the ↵Chris Kampmeier2009-01-113-5/+5
| | | | | | | | | | | | | | | | | | | | adjective
* | | | | 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-107-9/+62
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * | | | Merge commit 'fred/pullable'Pratik Naik2008-12-303-5/+8
| |\ \ \ \
| | * | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | | | | |
| | * | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2008-12-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | * | | | Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-261-1/+1
| | | | | |
| | * | | | Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-262-2/+2
| | | | | |
| * | | | | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2008-12-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | | | 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 ↵Yaroslav Markin2008-12-283-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | | | | | Rewrite ActiveRecord::Base#destroy_all docs to remove incorrect info, ↵Chris Kampmeier2009-01-061-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mention return value, and improve clarity (The incorrect information is "at least 2*N database queries" -- it's N+1 at best.)
* | | | | | | 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 ↵Chris Kampmeier2008-12-291-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks, mention return value, and improve clarity
* | | | | | | Made code segments and method names have fixed-width fontsDaniel Schierbeck2008-12-291-8/+9
| | | | | | |
* | | | | | | Merge commit 'mainstream/master'Pratik Naik2008-12-288-85/+138
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-287-68/+116
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed]Yaroslav Markin2008-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | | | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵Yaroslav Markin2008-12-271-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | | | Preload uses exclusive scope [#643 state:resolved]Frederick Cheung2008-12-261-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With self referential associations, the scope for the the top level should not affect fetching of associations, for example when doing Person.male.find :all, :include => :friends we should load all of the friends for each male, not just the male friends.
| * | | | Association preloading no longer stops if it hits a nil object [#1630 ↵Pivotal Labs2008-12-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* | | | | Revert inline docsPratik Naik2008-12-283-35/+35
| | | | |
* | | | | Rewrite ActiveRecord::Base.delete docs for clarity, and mention return valueChris Kampmeier2008-12-271-12/+13
| | | | |
* | | | | adds inline docs for dynamically created methods in Active RecordXavier Noria2008-12-273-35/+35
| | | | |
* | | | | It is better to have this commented out to let locale-checking scripts ↵Yaroslav Markin2008-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | perform better (rails-i18n)
* | | | | Documentation for merged joinsPivotal Labs2008-12-261-3/+8
|/ / / /
* | | | ActiveRecord::QueryCache middlewareJoshua Peek2008-12-222-14/+26
| | | |