aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
Commit message (Collapse)AuthorAgeFilesLines
* Migrate all the calculation methods to RelationPratik Naik2009-12-291-6/+5
|
* Merge commit 'Fingertips/master'Jeremy Kemper2009-12-281-2/+2
|\
| * Make polymorphic_inverse_of in Reflection throw an ↵Murray Steele2009-12-281-2/+2
| | | | | | | | | | | | InverseOfAssociationNotFoundError if the supplied class doesn't have the appropriate association. [#3520 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
* | Add Model.having and Relation#havingPratik Naik2009-12-291-2/+4
|/
* Use relation.from when constructing a relationPratik Naik2009-12-281-2/+3
|
* Add new finder methods to association collection.Pratik Naik2009-12-271-2/+2
|
* Rename Model.conditions and relation.conditions to .wherePratik Naik2009-12-261-3/+3
|
* When passing force_reload = true to an association, don't use the query ↵Will2009-12-161-2/+2
| | | | | | cache [#1827 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Revert "Revert "Assert primary key does not exist in habtm when the ↵Jeremy Kemper2009-11-231-1/+9
| | | | | | | | | | | | | association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
* Insert generated association members in the same order they are specified ↵Gabe da Silveira2009-11-171-2/+3
| | | | | | | | when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Revert "Split arel_table into method to get a relation and another to ↵Jeremy Kemper2009-11-131-2/+2
| | | | | | memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068.
* Split arel_table into method to get a relation and another to memoize the ↵Jeremy Kemper2009-11-131-2/+2
| | | | default relation.
* Ruby 1.9.2: avoid #flattenJeremy Kemper2009-11-131-6/+10
|
* delete correct records for a has_many with :primary_key and :dependent => ↵Matt Jones2009-11-101-1/+1
| | | | | | :delete_all Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Arel::In -> Arel::Predicates::InJeremy Kemper2009-11-021-1/+1
|
* Merge branch 'associations_2'Emilio Tagua2009-10-051-2/+2
|\
| * Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-051-2/+2
| |
* | Merge commit 'rails/master'Emilio Tagua2009-10-021-1/+3
|\ \
| * | Make has_one with :conditions hash scope build or creation of the associated ↵Luciano G Panaro2009-09-281-1/+3
| | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed]
* | | Merge commit 'rails/master'Emilio Tagua2009-09-141-3/+4
|\| |
| * | Added some documentation about setting :autosave => false on an association.Eloy Duran2009-09-121-3/+4
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-09-081-17/+36
|\| |
| * | Changed ActiveRecord to use new callbacks and speed up observers by only ↵José Valim2009-09-081-17/+36
| | | | | | | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | | Merge commit 'rails/master'Emilio Tagua2009-09-081-11/+2
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | Revert "Assert primary key does not exist in habtm when the association is ↵Jeremy Kemper2009-09-021-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81.
* | | Merge commit 'rails/master'Emilio Tagua2009-09-011-2/+11
|\| | | |/ |/| | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Assert primary key does not exist in habtm when the association is defined, ↵José Valim2009-09-011-12/+12
| | | | | | | | | | | | | | | | instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Remove useless conditionals/local var.Emilio Tagua2009-08-191-5/+1
| |
* | Make sure join association methods are called once.Emilio Tagua2009-08-191-9/+10
| |
* | Don't sanitize_sql where it doesn't make sense.Emilio Tagua2009-08-191-2/+2
| |
* | Remove old method and comment.Emilio Tagua2009-08-191-14/+0
| |
* | Remove useless InnerJoinDependency, inner joins are performed throughEmilio Tagua2009-08-191-21/+4
| | | | | | | | Arel::InnerJoin.
* | Remove whitespace.Emilio Tagua2009-08-191-0/+1
| |
* | Use immutable relation objects to generate queries.Emilio Tagua2009-08-181-19/+18
| |
* | Use finder options as relation method names to provide more familiarEmilio Tagua2009-08-181-17/+17
| | | | | | | | | | naming. Use bang methods convention in methods that alter the relation.
* | Clean up relation joins when finding records with included associations.Emilio Tagua2009-08-171-12/+12
| |
* | Use ARel's joins when building a query for finding records with includedEmilio Tagua2009-08-141-48/+58
| | | | | | | | associations.
* | Merge commit 'rails/master'Emilio Tagua2009-08-101-17/+49
|\| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * Enable has_many :through for going through a has_one association on the join ↵Gabe da Silveira2009-08-101-2/+29
| | | | | | | | | | | | model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Changed to use klass instead of constantizing in assign_ids generated methodDmitry Ratnikov2009-08-091-1/+1
| | | | | | | | | | | | [#260 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix for nested :include with namespaced models.Rich Bradley2009-08-091-1/+1
| | | | | | | | [#260 state:committed]
* | Removed unused methods.Emilio Tagua2009-08-071-70/+56
| |
* | Removed useless OR.Emilio Tagua2009-08-071-1/+1
| |
* | More work on removing plain SQL from associations and use ARel instead.Emilio Tagua2009-08-071-20/+19
| |
* | Merge commit 'rails/master'Emilio Tagua2009-07-311-5/+71
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Merge docrailsPratik Naik2009-07-251-5/+71
| |
* | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵Emilio Tagua2009-07-211-8/+9
| | | | | | | | AR relation
* | Merge commit 'rails/master'Emilio Tagua2009-07-161-3/+6
|\|
| * Add primary_key option to belongs_to associationSzymon Nowak2009-07-151-3/+6
| | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-161-8/+8
| |