aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Collapse)AuthorAgeFilesLines
* Pass a base relation to build_default_scope when joiningMatt Jones2014-02-211-1/+1
| | | | | This allows the default scope to be built using the current table alias. Resolves #12770
* Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
|
* Revert "speed up the collection proxy reader method, but slow down the ↵Arthur Neves2014-02-201-5/+1
| | | | | | | | constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116]
* add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we know the alias tracker is empty, we can create one that doesn't use a hash with default block for counting. ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.integer :comments_count end create_table :comments, force: true do |t| t.integer :post_id end end class Post < ActiveRecord::Base; has_many :comments; end class Comment < ActiveRecord::Base; belongs_to :post, counter_cache: true; end 10.times { Comment.create!(post: Post.create!) } record = Post.first association_name = :comments Benchmark.ips do |x| reflection = record.class.reflect_on_association(association_name) association = reflection.association_class.new(record, reflection) x.report('assoc') do reflection.association_class.new(record, reflection) end x.report('reader') do association.reader;nil end x.report('combined') do reflection.association_class.new(record, reflection).reader;nil end end [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0062s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 833 i/100ms reader 28703 i/100ms combined 839 i/100ms ------------------------------------------------- assoc 9010.3 (±3.8%) i/s - 44982 in 5.000022s reader 3214523.4 (±5.5%) i/s - 16016274 in 5.001136s combined 8841.0 (±5.8%) i/s - 44467 in 5.049269s [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0060s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 888 i/100ms reader 29217 i/100ms combined 900 i/100ms ------------------------------------------------- assoc 9674.3 (±3.3%) i/s - 48840 in 5.054022s reader 2988474.8 (±6.9%) i/s - 14842236 in 4.998230s combined 9674.0 (±3.1%) i/s - 48600 in 5.028694s
* guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-142-5/+3
|
* stop exposing table_joinsAaron Patterson2014-02-141-4/+3
|
* make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| | | | | This helps with our sanity. The class is internal, we can refactor to a "nice" API later.
* make a singleton for AssociationScopeAaron Patterson2014-02-142-1/+7
| | | | | AssociationScope no longer maintains state, so we're safe to keep a singleton and save on GC time
* pass the association and connection to the scope methodAaron Patterson2014-02-142-9/+3
|
* pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
|
* clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
|
* remove the reflection delegateAaron Patterson2014-02-141-15/+14
|
* remove klass delegatorAaron Patterson2014-02-141-10/+11
|
* remove chain delegateAaron Patterson2014-02-141-5/+6
|
* remove scope_chain delegateAaron Patterson2014-02-141-3/+3
|
* remove more delegate methodsAaron Patterson2014-02-131-7/+9
|
* :scissors: whitespaceAaron Patterson2014-02-131-1/+0
|
* rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
|
* JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-132-41/+25
|
* speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
|
* Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
|
* Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
|
* Merge pull request #13899 from ↵Rafael Mendonça França2014-02-041-1/+1
|\ | | | | | | | | Fortisque/kevin/active_record_HABTM_with_belongs_to destruction errors out on HABTM w/out primary key
| * fix HABTM w/out primary key errors on destructionKevin Casey2014-02-021-1/+1
| |
* | this class depends on JoinHelper, so we should require itAaron Patterson2014-01-311-0/+2
|/
* Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-311-0/+6
| | | | | Dangerous association names conflicts include instance or class methods already defined by `ActiveRecord::Base`.
* Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
|
* Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-211-0/+21
| | | | Need to define #reset on CollectionProxy.
* Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-212-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two regressions introduced in cafe31a078 where newly created finder methods #second, #third, #forth, and #fifth caused a NoMethodError error on reload associations and where we were pulling the wrong element out of cached associations. Examples: some_book.authors.reload.second # Before # => NoMethodError: undefined method 'first' for nil:NilClass # After # => #<Author id: 2, name: "Sally Second", ...> some_book.first.authors.first some_book.first.authors.second # Before # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 1, name: "Freddy First", ...> # After # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 2, name: "Sally Second", ...> Fixes #13783.
* add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
|
* `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-211-1/+1
| | | | | | | | | | Since Rails 4.0, we add an ORDER BY in the `first` method to ensure consistent results among different database engines. But for singular associations this behavior is not needed since we will have one record to return. As this ORDER BY option can lead some performance issues we are removing it for singular associations accessors. Fixes #12623.
* directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | rather than allocating a new Relation, just make the AST directly
* Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-1/+1
|
* Merge pull request #10134 from ↵Rafael Mendonça França2014-01-032-5/+5
|\ | | | | | | | | derikson/collection_proxy_select_with_multiple_args Change CollectionProxy#select to take the same arguments as ActiveRecord::select
| * Changed ActiveRecord::Associations::CollectionProxy#select to take multiple ↵Dan Erikson2013-04-082-5/+5
| | | | | | | | | | | | arguments. This makes the arguments the same as ActiveRecord::QueryMethods::select.
* | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix for #13437 Conflicts: activerecord/CHANGELOG.md
| * | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5 ↵Vipul A M2013-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8 introduced a regression in includes/preloades by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`. tl;dr Records are not made properly available via `read_attribute` when preloding in simultaneous, but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object. When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded records we make wrong use of `read_attribute`, instead of `target` records. The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place. Fixes #13437
* | | Make outer joins on proper parentWashington Luiz2013-12-311-1/+1
|/ / | | | | | | | | Outer joins were being built on the root relation klass rather than the one specified in the join dependency root
* | On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-231-1/+1
| | | | | | | | Fixes: #13445
* | Merge pull request #13417 from TalkativeTree/comments_changeRichard Schneeman2013-12-191-1/+1
|\ \ | | | | | | fix CollectionAssociation's comments
| * | change CollectionAssociation's comments to say Association instead of ↵Ben Angel2013-12-191-1/+1
| | | | | | | | | | | | AssociationProxy to match changes for 3.1 removing Association proxy.
* | | Fix nil assignment to polymorphic belongs_toJeremy Kemper2013-12-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Assigning nil to a polymorphic belongs_to would nullify its _id field by not its _type field. Fixes failing test from c141dfc838a5dca9f197814410fa5d44c143129c. Regression from 1678e959e973de32287b65c52ebc6cce87148951.
* | | extract cache counter logic to one methodAaron Patterson2013-12-121-11/+10
| | |
* | | remove duplicate codeAaron Patterson2013-12-121-15/+6
| | |
* | | extract a method for updating without a record objectAaron Patterson2013-12-121-6/+10
| | |
* | | extract methods out of the cache update methodAaron Patterson2013-12-121-14/+22
| | |
* | | pull a nil check up one frameAaron Patterson2013-12-121-6/+10
| | |
* | | remove more nil checksAaron Patterson2013-12-121-6/+5
| | |
* | | remove nil checkAaron Patterson2013-12-122-7/+11
| | | | | | | | | | | | | | | calling replace_keys could possibly do a nil check twice, this commit reduces it to once.
* | | remove the nil check from set_inverse_instanceAaron Patterson2013-12-124-4/+7
| | | | | | | | | | | | | | | methods that call set_inverse_instance with a record will not have to pay the cost of a nil check on every call