aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| |\ \
| | * | 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>
| * | | 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>
| * | 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>
| * ActiveRecord::QueryCache middlewareJoshua Peek2008-12-222-14/+26
| |
| * Ensure of Model#create support custom updated_at and updated_on attributes ↵Luis Hurtado2008-12-221-2/+2
| | | | | | | | | | | | [#1612 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure Model#last doesn't affects order for another finders inside the same ↵Daniel Luz2008-12-211-3/+8
| | | | | | | | | | | | scope [#1499 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix configure_dependency_for_has_many not quoting conditions properly [#1461 ↵Frederick Cheung2008-12-211-3/+3
| | | | | | | | state:resolved]
| * Remove dead commented out code [#1467 state:resolved]Yaroslav Markin2008-12-211-1/+0
| | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Fix has many through not quoting table names [#1163 state:resolved]Karthik Krishnan2008-12-202-4/+4
| | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Merge docrailsPratik Naik2008-12-195-11/+13
| |
| * Fix preloading of has_one :through associations on belongs_to [#1507 ↵Matt Jones2008-12-182-4/+17
| | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Free MySQL::Result objects after a call to execute [#1416 state:resolved]Manfred Stienstra2008-12-181-4/+13
| | | | | | | | | | | | | | | | No freeing Result objects causes the MySQL driver to free result sets at undefined times, this can lead to erratic performance in your application. Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Don't include table_name twiceFrederick Cheung2008-12-181-1/+1
| |
| * Ensure :include checks joins when determining if it can preload [#528 ↵Frederick Cheung2008-12-181-10/+33
| | | | | | | | state:resolved]
| * Fix preloading of belongs_to with null foreign key generating useless query ↵Frederick Cheung2008-12-181-0/+1
| | | | | | | | [#1027 state:resolved]
| * Make exceptions raise from find_by_foo! have a more helpful message [#1567 ↵Frederick Cheung2008-12-181-1/+1
| | | | | | | | state:resolved]
| * Update documentation for default_scopeDaniel Luz2008-12-161-2/+2
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Switch to Rack based session stores.Joshua Peek2008-12-152-0/+320
| |
| * Don't use the transaction instance method so that people with ↵Frederick Cheung2008-12-101-2/+2
| | | | | | | | | | | | | | | | has_one/belongs_to :transaction aren't fubared [#1551 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-101-7/+16
| |\
| | * Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵Bruce Krysiak2008-12-101-7/+16
| | | | | | | | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Revert "Fix: counter_cache should decrement on deleting associated records."Jeremy Kemper2008-12-101-3/+0
| |/ | | | | | | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc.
| * Add ActiveRecord::VERSION autoloadJeremy Kemper2008-12-101-0/+2
| |
| * Fix: counter_cache should decrement on deleting associated records.Emilio Tagua2008-12-101-0/+3
| | | | | | | | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Benchmark.msJeremy Kemper2008-12-092-7/+7
| |
* | Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-098-32/+74
|\|
| * Make word separator in AR validation error messages configurable.Akira Matsuda2008-12-081-1/+1
| | | | | | | | | | | | [#1294 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Change field_changed? method to handle the case where a nullable integer ↵Ben Symonds2008-12-081-2/+2
| | | | | | | | | | | | | | | | column is changed from 0 to '0' [#1530 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge with docrailsPratik Naik2008-12-076-28/+67
| |
| * Make NoMethodError message more descriptive when an undefined message has ↵Mike Ferrier2008-12-041-1/+4
| | | | | | | | | | | | been sent to an association [#1515 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | 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
| * Add :having option to find, to use in combination with grouped finds. Also ↵miloops2008-12-013-7/+15
| | | | | | | | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed]
| * Removed extra 'as' in :joins clause for habtm preloadingFoliosus2008-12-011-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1405 state:committed]
| * Ensure hash conditions on referenced tables are considered when eager ↵Paul2008-11-261-0/+1
| | | | | | | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Rename use_transactional_fixtures? so it doesn't collide with the ↵Jeremy Kemper2008-11-251-4/+4
| | | | | | | | superclass_delegating_accessor's query method
| * Add config.preload_frameworks to load all frameworks at startup. Default to ↵Jeremy Kemper2008-11-241-2/+0
| | | | | | | | false so Rails autoloads itself as it's used.
| * missed ActiveRecord::MigratorJoshua Peek2008-11-241-0/+1
| |
| * get activerecord tests passing with lazy loadingJoshua Peek2008-11-242-0/+6
| |