aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:rails/railsXavier Noria2010-12-2442-148/+401
|\
| * Verify that there is no unwanted implicit readonly set on ↵oleg dashevskii2010-12-231-1/+13
| | | | | | | | Model.has_many_through.find(id) [#5442 state:resolved]
| * Raise an error for associations which try to go :through a polymorphic ↵Jon Leighton2010-12-234-6/+22
| | | | | | | | association [#6212 state:resolved]
| * If a has_many goes :through a belongs_to, and the foreign key of the ↵Jon Leighton2010-12-2314-35/+124
| | | | | | | | belongs_to changes, then the has_many should be considered stale.
| * Improved strategy for updating a belongs_to association when the foreign key ↵Jon Leighton2010-12-237-45/+37
| | | | | | | | changes. Rather than resetting each affected association when the foreign key changes, we should lazily check for 'staleness' (where fk does not match target id) when the association is accessed.
| * Test to verify that #2189 (count with has_many :through and a named_scope) ↵Jon Leighton2010-12-232-0/+7
| | | | | | | | is fixed
| * Revert "Optimize <association>_ids for hm:t with belongs_to source". The ↵Jon Leighton2010-12-232-14/+3
| | | | | | | | | | | | | | | | | | | | optimisation has too many edge cases, such as when the reflection, source reflection, or through reflection has conditions, orders, etc. [#6153 state:resolved] This reverts commit 373b053dc8b99dac1abc3879a17a2bf8c30302b5. Conflicts: activerecord/lib/active_record/associations.rb
| * Test demonstrating problem with foo.association_ids where it's a has_many ↵Jon Leighton2010-12-231-0/+4
| | | | | | | | :through with :conditions, with a belongs_to as the source reflection
| * When a has_many association is not :uniq, appending the same record multiple ↵Jon Leighton2010-12-233-3/+24
| | | | | | | | times should append it to the @target multiple times [#5964 state:resolved]
| * Fix behaviour of foo.has_many_through_association.select('custom select') ↵Michał Łomnicki2010-12-232-2/+7
| | | | | | | | [#6089 state:resolved]
| * Fix creation of has_many through records with custom primary_key option on ↵Szymon Nowak2010-12-235-2/+38
| | | | | | | | belongs_to [#2990 state:resolved]
| * Verify that has_one :through preload respects the :conditions [#2976 ↵Will Bryant2010-12-232-0/+13
| | | | | | | | state:resolved]
| * Don't allow a has_one association to go :through a collection association ↵Jon Leighton2010-12-235-9/+26
| | | | | | | | [#2976 state:resolved]
| * Don't deprecate to_prepare.José Valim2010-12-232-9/+11
| |
| * Clean up callbacks should also be called on exceptions.José Valim2010-12-232-0/+17
| |
| * avoid duping and new objectsAaron Patterson2010-12-231-2/+3
| |
| * fixed retrieval of primary key value in Ralation#insert methodRaimonds Simanovskis2010-12-231-1/+1
| | | | | | | | previously primary key value was always assigned nil which caused Oracle enhanced adapter failing tests
| * Fix for default_scope tests to ensure comparing of equally sorted listsRaimonds Simanovskis2010-12-232-2/+2
| | | | | | | | | | | | This is additional fix for commit ebc47465a5865ab91dc7d058d2d8a0cc961510d7 Respect the default_scope on a join model when reading a through association which otherwise was failing on Oracle (as it returned fixture comments in different order).
| * arel can escape the id, so avoid using the database connectionAaron Patterson2010-12-221-1/+1
| |
| * Arel::Table#[] always returns an attribute, so no need for ||Aaron Patterson2010-12-221-1/+1
| |
| * probably should use the some_ids variable here. o_OAaron Patterson2010-12-221-1/+1
| |
| * removing SQL interpolation, please use scoping and attribute conditionals as ↵Aaron Patterson2010-12-224-13/+4
| | | | | | | | a replacement
| * use arel to compile SQL rather than build stringsAaron Patterson2010-12-221-1/+8
| |
| * to_sym stuff before passing it to arelAaron Patterson2010-12-222-2/+2
| |
| * build an AST rather than build SQL stringsAaron Patterson2010-12-221-1/+10
| |
| * Allow registering javascript/stylesheet_expansions to existing symbolsSantiago Pastorino2010-12-223-4/+29
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-2411-75/+294
|\ \ | |/ |/|
| * Revert "Query guide: arel_table, eq and eq_any" along with other commits ↵Ryan Bigg2010-12-241-131/+0
| | | | | | | | | | | | | | | | | | | | that added documentation involving the arel_table method This reverts commit 578f9711fdb42ca9fc4b8248c494afe755cd1c17. Conflicts: railties/guides/source/active_record_querying.textile
| * Query guide: visists => visitsRyan Bigg2010-12-241-1/+1
| |
| * minor convention editVijay Dev2010-12-241-1/+1
| |
| * fixing typo that crept in 2c8938fVijay Dev2010-12-241-1/+1
| |
| * It's JavaScript :)Vijay Dev2010-12-245-17/+17
| |
| * fixed inject example and some minor editsVijay Dev2010-12-241-6/+6
| |
| * indentation fixVijay Dev2010-12-231-9/+9
| |
| * Edits to caching/fragments.Rizwan Reza2010-12-231-17/+39
| |
| * More minor edits.Rizwan Reza2010-12-231-5/+5
| |
| * Revised documentation for cache_helper.Rizwan Reza2010-12-231-12/+10
| |
| * Query guide: add or conditionsRyan Bigg2010-12-231-0/+11
| |
| * Query guide: cover further ARel methodsRyan Bigg2010-12-231-7/+76
| |
| * Query guide: Document "in" methodsRyan Bigg2010-12-231-0/+25
| |
| * Query guide: arel_table, eq and eq_anyRyan Bigg2010-12-231-0/+26
| |
| * Query guide: specify what type of objects scopes returnRyan Bigg2010-12-231-1/+1
| |
| * Query guide: Ordering, selecting and so on shouldn't be nested in conditions ↵Ryan Bigg2010-12-231-9/+9
| | | | | | | | as they are modifiers, not conditions in the prime sense of the word.
| * Query Guide: update ChangelogRyan Bigg2010-12-231-0/+1
| |
| * Query guide: class methods are still available on associationsRyan Bigg2010-12-231-1/+5
| |
| * Query guide: scopes with arguments should be instead defined as class methods.Ryan Bigg2010-12-231-3/+31
| |
| * Query guide: fix indentationRyan Bigg2010-12-231-13/+13
| |
| * Remove comma [samuelkadoph]Ryan Bigg2010-12-231-1/+1
| |
| * Query guide: lambdas must be used when working with scopesRyan Bigg2010-12-231-0/+12
| |
| * Init guide: further revision, covering rails/plugin.rb and friendsRyan Bigg2010-12-231-4/+116
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 06:02:14 +0000