Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-18 | 6 | -10/+25 |
|\ | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 1 | -1/+1 |
| | | |||||
| * | Cache columns for has_and_belongs_to_many associations | lukeludwig | 2009-01-17 | 2 | -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 VandenBos | 2009-01-16 | 1 | -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 Lovitt | 2009-01-16 | 1 | -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 Kozuszko | 2009-01-16 | 1 | -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_descendant | Xavier Noria | 2009-01-15 | 1 | -1/+2 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-14 | 7 | -59/+216 |
|\| | |||||
| * | Fix PostgreSQL unit test failures that only occur when using the old ↵ | Hongli Lai (Phusion) | 2009-01-13 | 2 | -10/+12 |
| | | | | | | | | | | | | | | | | 'postgres' driver. [#1748 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 ↵ | Cody Fauser | 2009-01-13 | 1 | -5/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Introduce transaction_joinable flag to mark that the fixtures transaction ↵ | Jeremy Kemper | 2009-01-10 | 4 | -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 savepoints | Jeremy Kemper | 2009-01-10 | 22 | -163/+667 |
| |\ | |||||
| * \ | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-09 | 8 | -32/+74 |
| |\ \ | |||||
| * \ \ | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-03 | 15 | -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-03 | 2 | -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-03 | 1 | -2/+57 |
| | | | | | | | | | | | | | | | | | | | | documentation for nested transactions. | ||||
| * | | | | Make SQLite3 pass the unit tests for savepoints. | Hongli Lai (Phusion) | 2008-11-03 | 3 | -0/+14 |
| | | | | | |||||
| * | | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵ | Hongli Lai (Phusion) | 2008-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | transaction_test. | ||||
| * | | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵ | Hongli Lai (Phusion) | 2008-11-03 | 1 | -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-03 | 3 | -6/+74 |
| | | | | | | | | | | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions. | ||||
| * | | | | Implement savepoints. | Jonathan Viney | 2008-11-03 | 6 | -14/+53 |
| | | | | | |||||
* | | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the ↵ | Chris Kampmeier | 2009-01-11 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | adjective | ||||
* | | | | | A little copyediting of 73db43527d162fdf95665d88589f7ab6d17a17fa | Chris Kampmeier | 2009-01-11 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Add better docs for ActiveRecord::Base#attribute_for_inspect | Chris Kampmeier | 2009-01-11 | 1 | -1/+12 |
| | | | | | |||||
* | | | | | Minor changes to AR#delete/destroy docs | Pratik Naik | 2009-01-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-10 | 7 | -9/+62 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | | | | Merge commit 'fred/pullable' | Pratik Naik | 2008-12-30 | 3 | -5/+8 |
| |\ \ \ \ | |||||
| | * | | | | Fix to_sentence being used with options removed by 273c77 | Frederick Cheung | 2008-12-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵ | Roman Shterenzon | 2008-12-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| | * | | | | Fix :include of has_one with :primary_key option | Frederick Cheung | 2008-12-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix :include of has_many associations with :primary_key option | Frederick Cheung | 2008-12-26 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add transaction check to SQLite2 adapter to fix ↵ | Mike Gunderloy | 2008-12-30 | 1 | -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/rails | David Heinemeier Hansson | 2008-12-28 | 7 | -68/+116 |
| |\ \ \ \ \ | |||||
| * | | | | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵ | Yaroslav Markin | 2008-12-28 | 3 | -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 Kampmeier | 2009-01-06 | 1 | -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 comments | Xavier Noria | 2008-12-30 | 1 | -8/+16 |
| | | | | | | | |||||
* | | | | | | | Rewrite ActiveRecord::Base#delete docs to remove false information about ↵ | Chris Kampmeier | 2008-12-29 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks, mention return value, and improve clarity | ||||
* | | | | | | | Made code segments and method names have fixed-width fonts | Daniel Schierbeck | 2008-12-29 | 1 | -8/+9 |
| | | | | | | | |||||
* | | | | | | | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-28 | 8 | -85/+138 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 7 | -68/+116 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | | | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed] | Yaroslav Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | | | | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵ | Yaroslav Markin | 2008-12-27 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | | | | Preload uses exclusive scope [#643 state:resolved] | Frederick Cheung | 2008-12-26 | 1 | -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 Labs | 2008-12-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | | | | | Revert inline docs | Pratik Naik | 2008-12-28 | 3 | -35/+35 |
| | | | | | |||||
* | | | | | Rewrite ActiveRecord::Base.delete docs for clarity, and mention return value | Chris Kampmeier | 2008-12-27 | 1 | -12/+13 |
| | | | | | |||||
* | | | | | adds inline docs for dynamically created methods in Active Record | Xavier Noria | 2008-12-27 | 3 | -35/+35 |
| | | | | | |||||
* | | | | | It is better to have this commented out to let locale-checking scripts ↵ | Yaroslav Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | perform better (rails-i18n) | ||||
* | | | | | Documentation for merged joins | Pivotal Labs | 2008-12-26 | 1 | -3/+8 |
|/ / / / | |||||
* | | | | ActiveRecord::QueryCache middleware | Joshua Peek | 2008-12-22 | 2 | -14/+26 |
| | | | |