aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix dodgy tests which were effectively asserting nil == nilJon Leighton2010-12-262-3/+4
| |
* | Remove custom_select param from construct_select, as it isn't usedJon Leighton2010-12-261-3/+3
| |
* | Remove construct_from from ThroughAssociationScope - it's not called from ↵Jon Leighton2010-12-261-4/+0
| | | | | | | | anywhere
* | Set the create scope to an empty hash in ThroughAssociationScope. For ↵Jon Leighton2010-12-261-1/+5
| | | | | | | | reasoning please see the inline code comments.
* | Use conditionals and implicit returns rather than explicit returns and ↵Jon Leighton2010-12-261-3/+7
| | | | | | | | postfix ifs (it's easier to read)
* | Remove has_cached_counter? and cached_counter_attribute_name from ↵Jon Leighton2010-12-261-8/+0
| | | | | | | | HasManyThroughAssociation, as the exact same methods are inherited from HasManyAssociation
* | Remove pointless use of 'private'Jon Leighton2010-12-261-1/+0
| |
* | Use the through association proxy for operations on the through record, so ↵Jon Leighton2010-12-263-17/+17
| | | | | | | | that those operations are automatically scoped and therefore construct_join_attributes does not need to use construct_owner_attributes.
* | Remove target_obsolete? which is not called from anywhereJon Leighton2010-12-261-4/+0
| |
* | scoped.where_values_hash is never nilJon Leighton2010-12-261-1/+1
| |
* | Update JQuery UJSSantiago Pastorino2010-12-261-26/+48
| |
* | Update Prototype UJSSantiago Pastorino2010-12-261-29/+43
| |
* | use https to fetch files from GitHubAkira Matsuda2010-12-261-2/+2
| | | | | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere [#6223 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | refactor to use group_byAaron Patterson2010-12-251-3/+3
| |
* | arel will deal with casting the ids, so we can delete thisAaron Patterson2010-12-251-13/+1
| |
* | use arel to determine selection columnAaron Patterson2010-12-251-2/+1
| |
* | refactoring method selectionAaron Patterson2010-12-251-10/+5
| |
* | using arel to compile sql statementsAaron Patterson2010-12-254-10/+21
| |
* | use sql literal factory methodAaron Patterson2010-12-251-1/+1
| |
* | take more advantage of arel sql compilerAaron Patterson2010-12-252-13/+21
| |
* | refactoring AST buildingAaron Patterson2010-12-251-5/+3
| |
* | use arel to compile SQL statementsAaron Patterson2010-12-251-6/+15
| |
* | stop redifining methods on every call to set_primary_keyAaron Patterson2010-12-243-8/+23
| |
* | use the sql literal factory methodAaron Patterson2010-12-241-1/+1
| |
* | stop the recursive insanityAaron Patterson2010-12-241-5/+10
| |
* | setting the primary key on the update managerAaron Patterson2010-12-241-0/+1
| |
* | Bump up rack-cacheSantiago Pastorino2010-12-241-1/+1
|/
* 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
| |