aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2009-11-171-214/+156
|\
| * Revert "Split arel_table into method to get a relation and another to memoize...Jeremy Kemper2009-11-131-2/+2
| * Split arel_table into method to get a relation and another to memoize the def...Jeremy Kemper2009-11-131-2/+2
| * Ruby 1.9.2: avoid #flattenJeremy Kemper2009-11-131-6/+10
| * delete correct records for a has_many with :primary_key and :dependent => :de...Matt Jones2009-11-101-1/+1
| * 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
| |\ \
| * \ \ Merge commit 'rails/master'Emilio Tagua2009-09-141-3/+4
| |\ \ \
| * \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-081-17/+36
| |\ \ \ \
| * \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-081-11/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-011-2/+11
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
| * | | | | | 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
| * | | | | | 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
| * | | | | | Merge commit 'rails/master'Emilio Tagua2009-08-101-17/+49
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | Introduced ActiveRecord::Relation, a layer between an ARel relation and an AR...Emilio Tagua2009-07-211-8/+9
| * | | | | | | | Merge commit 'rails/master'Emilio Tagua2009-07-161-3/+6
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-161-8/+8
| * | | | | | | | | Merge commit 'rails/master'Emilio Tagua2009-07-141-1/+8
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Arel now buils SQL queries for associations. Removed old code andEmilio Tagua2009-06-231-47/+6
| * | | | | | | | | | Leave the quoting part to ARelEmilio Tagua2009-06-121-7/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use ARel in SQL generation through associationsEmilio Tagua2009-06-101-11/+15
| * | | | | | | | | | | Merge commit 'rails/master'Emilio Tagua2009-06-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-05-181-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-05-121-10/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-05-051-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Calculations now use Arel to construct the query.Emilio Tagua2009-04-291-10/+18
* | | | | | | | | | | | | | | | There is no query method for belongs_to associations.Ryan Bigg2009-10-271-1/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Make has_one with :conditions hash scope build or creation of the associated ...Luciano G Panaro2009-09-281-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Added some documentation about setting :autosave => false on an association.Eloy Duran2009-09-121-3/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Changed ActiveRecord to use new callbacks and speed up observers by only noti...José Valim2009-09-081-17/+36
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Revert "Assert primary key does not exist in habtm when the association is de...Jeremy Kemper2009-09-021-11/+11
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Assert primary key does not exist in habtm when the association is defined, i...José Valim2009-09-011-12/+12
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Enable has_many :through for going through a has_one association on the join ...Gabe da Silveira2009-08-101-2/+29
* | | | | | | | | | Changed to use klass instead of constantizing in assign_ids generated methodDmitry Ratnikov2009-08-091-1/+1
* | | | | | | | | | Fix for nested :include with namespaced models.Rich Bradley2009-08-091-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge docrailsPratik Naik2009-07-251-5/+71
| |_|_|_|_|_|_|/ |/| | | | | | |