Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote branch 'rsim/require_deprecation' | Aaron Patterson | 2011-01-04 | 1 | -0/+2 | |
|\ | | | | | | | | | * rsim/require_deprecation: require ActiveSupport deprecatation file before using deprecate method in database_statements | |||||
| * | require ActiveSupport deprecatation file before using deprecate method in ↵ | Raimonds Simanovskis | 2011-01-04 | 1 | -0/+2 | |
| | | | | | | | | | | database_statements otherwise when using external ActiveRecord adapters (e.g. Oracle) database_statements might be loaded before active_support/core_ext/module/deprecation which results in NoMethodError (commit 60cf65def805995bcca184c40b44bb01d86a48aa added "deprecate" call to database_statements.rb) | |||||
* | | Merge remote branch 'rsim/habtm_select_fix' | Aaron Patterson | 2011-01-04 | 2 | -2/+3 | |
|\ \ | | | | | | | | | | | | | * rsim/habtm_select_fix: Explicitly select * from has_and_belongs_to_many association tables, simplify exists? query | |||||
| * | | Explicitly select * from has_and_belongs_to_many association tables, ↵ | Raimonds Simanovskis | 2011-01-04 | 2 | -2/+3 | |
| |/ | | | | | | | | | simplify exists? query Previous version (after commit 3103296a61709e808aa89c3d37cf22bcdbc5a675) was generating wrong SQL for Oracle when calling exists? method on HABTM association. | |||||
* | | Use Rails 3.1 `change` method in 'add_' migration generator | Prem Sichanugrist | 2011-01-04 | 1 | -0/+8 | |
| | | ||||||
* | | Use Rails 3.1 `change` method in model generator | Prem Sichanugrist | 2011-01-04 | 1 | -5/+1 | |
|/ | ||||||
* | Remove undocumented feature from has_one where you could pass false as the ↵ | Jon Leighton | 2011-01-03 | 4 | -64/+18 | |
| | | | | | | | | | | | | second parameter to build_assoc or create_assoc, and the existing associated object would be untouched (the foreign key would not be nullified, and it would not be deleted). If you want behaviour similar to this you can do the following things: * Use :dependent => :nullify (or don't specify :dependent) if you want to prevent the existing associated object from being deleted * Use has_many if you actually want multiple associated objects * Explicitly set the foreign key if, for some reason, you really need to have multiple objects associated with the same has_one. E.g. previous = obj.assoc obj.create_assoc previous.update_attributes(:obj_id => obj.id) | |||||
* | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 7 | -28/+25 | |
| | | | | ActiveRecord::Base.primary_key does. | |||||
* | Implement deprecated version of AssociationReflection#primary_key_name, ↵ | Jon Leighton | 2011-01-03 | 2 | -0/+18 | |
| | | | | 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 | 4 | -12/+25 | |
| | | | | 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. | |||||
* | Create the association scope directly rather than going through with_scope | Jon Leighton | 2011-01-03 | 7 | -31/+32 | |
| | ||||||
* | Make Relation#create_with always merge rather than overwrite, not just when ↵ | Jon Leighton | 2011-01-03 | 3 | -4/+12 | |
| | | | | 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). | |||||
* | Use the association directly in other places too | Jon Leighton | 2011-01-03 | 3 | -20/+13 | |
| | ||||||
* | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵ | Jon Leighton | 2011-01-03 | 14 | -114/+90 | |
| | | | | 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... | |||||
* | Rename AssociationProxy#foreign_key_present to foreign_key_present? | Jon Leighton | 2011-01-03 | 4 | -7/+7 | |
| | ||||||
* | Allow assignment on has_one :through where the owner is a new record [#5137 ↵ | Jon Leighton | 2011-01-03 | 15 | -85/+113 | |
| | | | | | | | | | | 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 | 8 | -28/+24 | |
| | | | | options[:foreign_type] | |||||
* | Add documentation for the :foreign_type option on belongs_to | Jon Leighton | 2011-01-03 | 1 | -0/+5 | |
| | ||||||
* | 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 | 3 | -12/+4 | |
| | ||||||
* | User id instead of quoted_id to prevent double quoting. Fixes failing test ↵ | Robert Pankowecki (Gavdi) | 2011-01-04 | 1 | -1/+1 | |
| | | | | for bug #6036. | |||||
* | 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 | 16 | -54/+56 | |
| | | | | options key which it relates to is :foreign_key | |||||
* | Support for :counter_cache on polymorphic belongs_to | Jon Leighton | 2010-12-31 | 3 | -1/+14 | |
| | ||||||
* | Refactor BelongsToAssociation to allow BelongsToPolymorphicAssociation to ↵ | Jon Leighton | 2010-12-31 | 6 | -120/+127 | |
| | | | | inherit from it | |||||
* | Specify the STI type condition using SQL IN rather than a whole load of ORs. ↵ | Jon Leighton | 2010-12-31 | 4 | -6/+21 | |
| | | | | 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 | |||||
* | Get rid of extra_conditions param from configure_dependency_for_has_many. I ↵ | Jon Leighton | 2010-12-31 | 1 | -9/+3 | |
| | | | | can't see a particularly plausible argument for this being used by plugins, and if they really want they can just redefine the callback or whatever. Note also that before my recent commit the extra_conditions param was completely ignored for :dependent => :destroy. | |||||
* | And owner_quoted_id can go too | Jon Leighton | 2010-12-31 | 3 | -22/+0 | |
| | ||||||
* | Now we can drop-kick AssociationReflection#dependent_conditions into oblivion. | Jon Leighton | 2010-12-31 | 1 | -11/+0 | |
| | ||||||
* | Refactor configure_dependency_for_has_many to use ↵ | Jon Leighton | 2010-12-31 | 2 | -41/+24 | |
| | | | | 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 | 2 | -2/+4 | |
| | ||||||
* | Make serialized fixtures work again | Pratik Naik | 2010-12-29 | 6 | -5/+20 | |
| | ||||||
* | Do not use primary key on insertion when it's nil | Santiago Pastorino | 2010-12-29 | 1 | -2/+2 | |
| | ||||||
* | Simplify inspect implementation | Santiago Pastorino | 2010-12-28 | 1 | -1/+1 | |
| | | | | | After 304d38c0536dc32a8a1595ba34370ebf69a0d50d we don't need the new_record? check anymore. | |||||
* | Allow primary_key to be an attribute when the model is a new record | Santiago Pastorino | 2010-12-28 | 3 | -4/+4 | |
| | ||||||
* | I N C E P T I O N: flatten_deeper works around a bug in Ruby 1.8.2. | Aaron Patterson | 2010-12-27 | 3 | -15/+3 | |
| | ||||||
* | No need to symbolize these. | José Valim | 2010-12-27 | 1 | -2/+4 | |
| | ||||||
* | try not to make so many funcalls | Aaron Patterson | 2010-12-26 | 1 | -3/+6 | |
| | ||||||
* | make our hash of klasses and ids actually have classes for keys | Aaron Patterson | 2010-12-26 | 1 | -8/+6 | |
| | ||||||
* | stop calling deprecated apis | Aaron Patterson | 2010-12-26 | 2 | -5/+5 | |
| | ||||||
* | Refactor we_can_set_the_inverse_on_this? to use a less bizarre name amongst ↵ | Jon Leighton | 2010-12-26 | 10 | -52/+41 | |
| | | | | other things | |||||
* | Add a HasAssociation module for common code for has_* associations | Jon Leighton | 2010-12-26 | 8 | -61/+69 | |
| | ||||||
* | Remove AssociationProxy#dependent? - it's badly named and only used in one place | Jon Leighton | 2010-12-26 | 2 | -6/+1 | |
| | ||||||
* | Associations: DRY up the code which is generating conditions, and make it ↵ | Jon Leighton | 2010-12-26 | 7 | -65/+50 | |
| | | | | all use arel rather than SQL strings | |||||
* | Fix dodgy tests which were effectively asserting nil == nil | Jon Leighton | 2010-12-26 | 2 | -3/+4 | |
| | ||||||
* | Remove custom_select param from construct_select, as it isn't used | Jon Leighton | 2010-12-26 | 1 | -3/+3 | |
| | ||||||
* | Remove construct_from from ThroughAssociationScope - it's not called from ↵ | Jon Leighton | 2010-12-26 | 1 | -4/+0 | |
| | | | | anywhere | |||||
* | Set the create scope to an empty hash in ThroughAssociationScope. For ↵ | Jon Leighton | 2010-12-26 | 1 | -1/+5 | |
| | | | | reasoning please see the inline code comments. |