aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-113-4/+4
|\ | | | | | | | | Conflicts: guides/source/action_mailer_basics.md
| * JoinPart is no longer an abstract classNeeraj Singh2013-04-081-1/+1
| |
| * minor copy editingNeeraj Singh2013-03-302-3/+3
| |
* | rdoc for some of the methods in JoinDependencyNeeraj Singh2013-04-102-0/+36
| |
* | remove_duplicate_results! should be protectedNeeraj Singh2013-04-101-2/+2
| |
* | While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3002. Also see #5494. ``` class Comment < ActiveRecord::Base belongs_to :post end class Author < ActiveRecord::Base has_many :posts end class Post < ActiveRecord::Base belongs_to :author has_many :comments end ``` `Comment.joins(:post).merge(Post.joins(:author).merge(Author.where(:name => "Joe Blogs"))).all` would fail with `ActiveRecord::ConfigurationError: Association named 'author' was not found on Comment`. It is failing because `all` is being called on relation which looks like this after all the merging: `{:joins=>[:post, :author], :where=>[#<Arel::Nodes::Equality: ....}`. In this relation all the context that `Post` was joined with `Author` is lost and hence the error that `author` was not found on `Comment`. Ths solution is to build JoinAssociation when two relations with join information are being merged. And later while building the arel use the previously built `JoinAssociation` record in `JoinDependency#graft` to build the right from clause. Thanks to Jared Armstrong (https://github.com/armstrjare) for most of the work. I ported it to make it compatible with new code base.
* | changed variable name active_record => base_klassNeeraj Singh2013-04-094-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code stores the klass name in active_record and this is used throughout. While reviewing the code time and again I had the mental picture of active_record being an instance of a klass. However here the actual klass is being stored in @active_record. Secondly at two different places while referring to @active_record the comment refers to it as base klass. All this points to active_record being not the best variable name. So I thought it is better to replace active_record with base_klass. This change is confined to JoinDependency, JoinBase, JoinPart and JoinAssociation - all joining related work.
* | Avoid iterating over records hash when not necessaryCarlos Antonio da Silva2013-04-071-2/+6
| | | | | | | | | | | | If the reflection scope is not flagged with distinct value, there is no need to iterate over the records, so we avoid that by doing the check before iterating rather than inside the iteration block.
* | each to each_value; remove unused varsVipul A M2013-04-071-1/+1
| |
* | Merge pull request #9996 from mikz/masterJon Leighton2013-04-051-0/+1
|\ \ | | | | | | Association with inverse_of does not set the parent in association building block
| * | fix inverse_of association in block of new childMichal Cichra2013-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes inconsistency when building children of association which has inverse_of set properly. When creating new association object with a block: parent.association.build do |child| child.parent.equal?(parent) # false end So the block the `child.parent` did not point to the same object. But when the object is created it points to same instance: child = parent.association.build child.parent.equal?(parent) # true
* | | Merge pull request #10058 from jamesgolick/masterJon Leighton2013-04-051-4/+2
|\ \ \ | | | | | | | | Avoid calling define_method in CollectionProxy#scope
| * | | Refactor CollectionProxy#scope to avoid calling #extend.James Golick2013-04-021-4/+2
| | | |
* | | | Avoid an attempt to fetch old record when id was not present in touch callbackCarlos Antonio da Silva2013-04-041-7/+7
| | | |
* | | | Use the correct pk field from the reflected class to find the old recordCarlos Antonio da Silva2013-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation was using the source class foreign key field instead of the reflected primary key one to find the old record. For instance, for this scenario class Bulb < ActiveRecord::Base belongs_to :car, :touch => true end class Car < ActiveRecord::Base has_many :bulbs end the current implementation was trying to do this query: Car.where(car_id: X).first where we should be doing this query: Car.where(id: X).first This should hopefully fix the build.
* | | | Use inspect when writing the foreign key from the reflectionAndrew White2013-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If we don't use inspect inside the class_eval block then the foreign key is written without quotes causing us to fetch the foreign key value and not the column name.
* | | | use | to have more intent revealing codeNeeraj Singh2013-04-041-1/+1
| | | | | | | | | | | | | | | | thanks to @egilburg for suggestion
* | | | Merge pull request #10087 from neerajdotname/10016Carlos Antonio da Silva2013-04-041-0/+1
|\ \ \ \ | | | | | | | | | | has_many through obeys order on through association
| * | | | has_many through obeys order on through associationNeeraj Singh2013-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | fixes #10016
* | | | | Merge pull request #10088 from neerajdotname/fixes1Rafael Mendonça França2013-04-042-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | minor fixes including variable name change and expanded rdoc
| * | | | show name of the klass that has missing associationNeeraj Singh2013-04-021-1/+1
| | | | |
| * | | | not a relation. it's an arel select managerNeeraj Singh2013-04-021-4/+4
| |/ / /
* | | | Merge pull request #9141 from adamgamble/issue-9091David Heinemeier Hansson2013-04-031-0/+10
|\ \ \ \ | | | | | | | | | | belongs_to :touch should touch old record when transitioning.
| * | | | Modifies belong_to touch callback to touch old associations also #9091Adam Gamble2013-03-141-0/+10
| | | | |
* | | | | Merge pull request #10049 from vipulnsward/optimize_around_merge_v1Rafael Mendonça França2013-04-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | optimize some code around merge
| * | | | | optimize some code around mergeVipul A M2013-04-031-1/+1
| | |_|_|/ | |/| | |
* | | | | Move alias method near to the aliased one in collection proxyCarlos Antonio da Silva2013-04-031-2/+1
| |_|/ / |/| | |
* | | | no need to invoke to_s before applying internNeeraj Singh2013-04-021-1/+1
| | | |
* | | | Updated the error message for +find+ on an inverse_of associationwangjohn2013-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | so that it is consistent with the error thrown for +find+ without an inverse_of association.
* | | | Throwing a RecordNotFound exception when a record is scanned using thewangjohn2013-04-011-1/+13
|/ / / | | | | | | | | | | | | inverse_of option. I've also refactored the code for raising a RecordNotFound exception when searching for records with ids.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
| * | | explain method invertible_for [ci skip]Neeraj Singh2013-03-291-1/+2
| | | |
* | | | Do not use deprecate method [ci skip]Neeraj Singh2013-03-291-1/+1
| | | |
* | | | fix broken sentence [ci skip]Neeraj Singh2013-03-291-1/+1
| |_|/ |/| |
* | | Adding a bang to method name of raise_on_type_mismatch.wangjohn2013-03-216-8/+8
| | |
* | | Update other counter caches on destroyIan Young2013-03-202-2/+2
| | |
* | | Properly named variable inside blockAnupam Choudhury2013-03-201-2/+2
| | | | | | | | | | | | Closes #9824.
* | | Calling find() on an association with an inverse will now check to seewangjohn2013-03-191-2/+3
| | | | | | | | | | | | | | | if the association already holds that record in memory before checking the database for the specified ids.
* | | 1. Change from each to each_value since we did not use keyVipul A M2013-03-191-1/+1
| | | | | | | | | | | | 2. drop assignment of value to sum in test
* | | If a counter_cache is defined, then using update_attributes and changingJohn Wang2013-03-151-0/+20
| | | | | | | | | | | | | | | the primary key on an association will make sure that the corresponding counter on the association is changed properly. Fixes #9722.
* | | Cache the association proxy objectJon Leighton2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reimplements the behaviour of Rails 3, as I couldn't see why we shouldn't cache the object, and @alindeman had a good use case for caching it: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312
* | | Deprecate the `:distinct` option for `Relation#count`.Yves Senn2013-03-151-2/+3
| | | | | | | | | | | | | | | | | | | | | We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated.
* | | rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works.Yves Senn2013-03-153-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`.
* | | hide more data in the schema cacheAaron Patterson2013-03-141-1/+1
| |/ |/|
* | dependent: :destroy should call destroy_allNeeraj Singh2013-03-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit https://github.com/rails/rails/pull/9668 shows warning when `delete_all` is invoked with `:dependent` option `:destroy`. Unfortunately invoking `Post.destroy_all` invokes `post.comments.delete_all` as part of `has_many` callbacks. This commit ensures that instead `post.comments.destroy_all` is invoked and in the process no warning is generated. See issue #9567 for details .
* | Show warning message if delete_all is firing callbacksNeeraj Singh2013-03-111-0/+9
| | | | | | | | | | | | `post.comments.delete_all` will fire callbacks if :dependent option is :destroy . It will be fixed in Rails 4.1 . In the meantime display a warning . Look at #9567 for details .
* | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-091-3/+3
|/ | | | | This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals.
* deal with `#append` and `#prepend` on association collections.Yves Senn2013-03-011-0/+5
| | | | | | | | | | | Closes #7364. Collection associations behave similar to Arrays. However there is no way to prepend records. And to append one should use `<<`. Before this patch `#append` and `#prepend` did not add the record to the loaded association. `#append` now behaves like `<<` and `#prepend` is not defined.
* don't use non-ascii ' chars in documentationYves Senn2013-03-011-4/+4
|
* Fix touching an invalid parent record for belongs_toOlek Janiszewski2013-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | If the parent of a `belongs_to` record fails to be saved due to validation errors, `touch` will be called on a new record, which causes an exception (see https://github.com/rails/rails/pull/9320). Example: class Owner < ActiveRecord::Base validates_presence_of :name end class Pet < ActiveRecord::Base belongs_to :owner, touch: true end pet = Pet.new(owner: Owner.new) # Before, this line would raise ActiveRecord::ActiveRecordError # "can not touch on a new record object" pet.save