Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+4 | |
| | | | | | | | | ActiveRecord::Base.primary_key does. | |||||
| * | Implement deprecated version of AssociationReflection#primary_key_name, ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+12 | |
| | | | | | | | | which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1. | |||||
| * | When preloading a belongs_to, the target should still be set (to nil) if ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+9 | |
| | | | | | | | | there is no foreign key present. And the loaded flag should be set on the association proxy. This then allows us to remove the foreign_key_present? check from BelongsToAssociation#find_target. Also added a test for the same thing on polymorphic associations. | |||||
| * | Make Relation#create_with always merge rather than overwrite, not just when ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+10 | |
| | | | | | | | | merging two relations. If you wish to overwrite, you can do relation.create_with(nil), or for a specific attribute, relation.create_with(:attr => nil). | |||||
| * | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵ | Jon Leighton | 2011-01-03 | 6 | -15/+22 | |
| | | | | | | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences. | |||||
| * | Fix test_any in relations_test.rb, which was failing when relations_test.rb ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+8 | |
| | | | | | | | | is run on its own (it passes when the entire suite is run). This is a hacky fix for a problem I didn't quite get to the bottom of, so I'd welcome a better solution... | |||||
| * | Allow assignment on has_one :through where the owner is a new record [#5137 ↵ | Jon Leighton | 2011-01-03 | 6 | -23/+61 | |
| | | | | | | | | | | | | | | | | | | | | state:resolved] This required changing the code to keep the association proxy for a belongs_to around, despite its target being nil. Which in turn required various changes to the way that stale target checking is handled, in order to support various edge cases (loaded target is nil then foreign key added, foreign key is changed and then changed back, etc). A side effect is that the code is nicer and more succinct. Note that I am removing test_no_unexpected_aliasing since that is basically checking that the proxy for a belongs_to *does* change, which is the exact opposite of the intention of this commit. Also adding various tests for various edge cases and related things. Phew, long commit message! | |||||
| * | Have a proper AssociationReflection#foreign_type method rather than using ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+6 | |
| | | | | | | | | options[:foreign_type] | |||||
| * | Some basic tests for the :foreign_type option on belongs_to, which was ↵ | Jon Leighton | 2011-01-03 | 3 | -2/+33 | |
| | | | | | | | | previously completely untested. | |||||
| * | herp derpricating add_limit_offset! | Aaron Patterson | 2011-01-03 | 1 | -12/+0 | |
| | | ||||||
| * | Added one more failing test for bug #6036 | Robert Pankowecki (Gavdi) | 2011-01-04 | 1 | -0/+6 | |
| | | ||||||
| * | Rename AssociationReflection#primary_key_name to foreign_key, since the ↵ | Jon Leighton | 2010-12-31 | 1 | -3/+5 | |
| | | | | | | | | options key which it relates to is :foreign_key | |||||
| * | Support for :counter_cache on polymorphic belongs_to | Jon Leighton | 2010-12-31 | 2 | -0/+13 | |
| | | ||||||
| * | Refactor BelongsToAssociation to allow BelongsToPolymorphicAssociation to ↵ | Jon Leighton | 2010-12-31 | 1 | -6/+36 | |
| | | | | | | | | inherit from it | |||||
| * | Specify the STI type condition using SQL IN rather than a whole load of ORs. ↵ | Jon Leighton | 2010-12-31 | 1 | -0/+7 | |
| | | | | | | | | Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query. | |||||
| * | Verify that when has_many associated objects are destroyed via :dependent => ↵ | Jon Leighton | 2010-12-31 | 2 | -1/+25 | |
| | | | | | | | | :destroy, when the parent is destroyed, the callbacks are run | |||||
| * | Refactor configure_dependency_for_has_many to use ↵ | Jon Leighton | 2010-12-31 | 1 | -3/+4 | |
| | | | | | | | | AssociationCollection#delete_all. It was necessary to change test_before_destroy in lifecycle_test.rb so that it checks topic.replies.size *before* doing the destroy, as afterwards it will now (correctly) be 0. | |||||
| * | Make sure Model#touch doesn't try to update non existing columns | Pratik Naik | 2010-12-30 | 1 | -1/+3 | |
| | | ||||||
| * | Make serialized fixtures work again | Pratik Naik | 2010-12-29 | 5 | -4/+18 | |
| | | ||||||
| * | Allow primary_key to be an attribute when the model is a new record | Santiago Pastorino | 2010-12-28 | 1 | -1/+1 | |
| | | ||||||
| * | stop calling deprecated apis | Aaron Patterson | 2010-12-26 | 2 | -5/+5 | |
| | | ||||||
| * | Associations: DRY up the code which is generating conditions, and make it ↵ | Jon Leighton | 2010-12-26 | 1 | -1/+0 | |
| | | | | | | | | all use arel rather than SQL strings | |||||
| * | Fix dodgy tests which were effectively asserting nil == nil | Jon Leighton | 2010-12-26 | 2 | -3/+4 | |
| | | ||||||
| * | using arel to compile sql statements | Aaron Patterson | 2010-12-25 | 2 | -1/+2 | |
| | | ||||||
| * | take more advantage of arel sql compiler | Aaron Patterson | 2010-12-25 | 1 | -1/+1 | |
| | | ||||||
| * | stop redifining methods on every call to set_primary_key | Aaron Patterson | 2010-12-24 | 2 | -4/+12 | |
| | | ||||||
| * | Verify that there is no unwanted implicit readonly set on ↵ | oleg dashevskii | 2010-12-23 | 1 | -1/+13 | |
| | | | | | | | | Model.has_many_through.find(id) [#5442 state:resolved] | |||||
| * | Raise an error for associations which try to go :through a polymorphic ↵ | Jon Leighton | 2010-12-23 | 2 | -4/+10 | |
| | | | | | | | | association [#6212 state:resolved] | |||||
| * | If a has_many goes :through a belongs_to, and the foreign key of the ↵ | Jon Leighton | 2010-12-23 | 8 | -31/+88 | |
| | | | | | | | | belongs_to changes, then the has_many should be considered stale. | |||||
| * | Improved strategy for updating a belongs_to association when the foreign key ↵ | Jon Leighton | 2010-12-23 | 2 | -2/+5 | |
| | | | | | | | | 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 Leighton | 2010-12-23 | 2 | -0/+7 | |
| | | | | | | | | is fixed | |||||
| * | Revert "Optimize <association>_ids for hm:t with belongs_to source". The ↵ | Jon Leighton | 2010-12-23 | 1 | -6/+2 | |
| | | | | | | | | | | | | | | | | | | | | 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 Leighton | 2010-12-23 | 1 | -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 Leighton | 2010-12-23 | 1 | -0/+10 | |
| | | | | | | | | times should append it to the @target multiple times [#5964 state:resolved] | |||||
| * | Fix behaviour of foo.has_many_through_association.select('custom select') ↵ | Michał Łomnicki | 2010-12-23 | 1 | -0/+5 | |
| | | | | | | | | [#6089 state:resolved] | |||||
| * | Fix creation of has_many through records with custom primary_key option on ↵ | Szymon Nowak | 2010-12-23 | 4 | -1/+32 | |
| | | | | | | | | belongs_to [#2990 state:resolved] | |||||
| * | Verify that has_one :through preload respects the :conditions [#2976 ↵ | Will Bryant | 2010-12-23 | 2 | -0/+13 | |
| | | | | | | | | state:resolved] | |||||
| * | Don't allow a has_one association to go :through a collection association ↵ | Jon Leighton | 2010-12-23 | 3 | -9/+16 | |
| | | | | | | | | [#2976 state:resolved] | |||||
| * | Fix for default_scope tests to ensure comparing of equally sorted lists | Raimonds Simanovskis | 2010-12-23 | 2 | -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). | |||||
| * | removing SQL interpolation, please use scoping and attribute conditionals as ↵ | Aaron Patterson | 2010-12-22 | 2 | -7/+0 | |
| | | | | | | | | a replacement | |||||
| * | define_attr_method must serialize nil correctly | Aaron Patterson | 2010-12-20 | 3 | -0/+14 | |
| | | ||||||
| * | if there is no base name, we cannot determine a primary key | Aaron Patterson | 2010-12-20 | 1 | -0/+2 | |
| | | ||||||
| * | has_many associations with :dependent => :delete_all should update the ↵ | Jon Leighton | 2010-12-20 | 3 | -0/+15 | |
| | | | | | | | | counter cache when deleting records | |||||
| * | Fix problem where wrong keys are used in JoinAssociation when an association ↵ | Jon Leighton | 2010-12-20 | 3 | -0/+13 | |
| | | | | | | | | goes :through a belongs_to [#2801 state:resolved] | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 49 | -213/+761 | |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | |||||
| * | ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved] | Piotr Sarnacki | 2010-12-16 | 1 | -0/+4 | |
| | | ||||||
| * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 4 | -0/+34 | |
| | | | | | | | | [#2421 state:resolved] | |||||
| * | Fix problem with duplicated records when a :uniq :through association is ↵ | Jon Leighton | 2010-12-15 | 2 | -2/+15 | |
| | | | | | | | | preloaded [#2447 state:resolved] | |||||
| * | Replace rudimentary named_scope with scope. [#6052 state:resolved] | Pavel Gorbokon | 2010-12-15 | 3 | -25/+25 | |
| | | | | | | | | | | | | | | * rename method names (actually in tests) * rename instance variable @_named_scopes_cache to @_scopes_cache * rename references in doc comments * don't touch CHANGELOG :) | |||||
| * | Provide test for #4840: to_xml doesn't work in such case: ↵ | Franck Verrot | 2010-12-15 | 1 | -0/+6 | |
| | | | | | | | | Event.select('title as t').to_xml |