aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Add new finder methods to association collection.Pratik Naik2009-12-271-2/+17
* Rename Model.conditions and relation.conditions to .wherePratik Naik2009-12-262-2/+2
* Revert "Fix instance_eval calls to association proxies"Joshua Peek2009-12-121-2/+6
* Fix instance_eval calls to association proxiesMat Brown2009-12-021-6/+2
* Revert "Revert "Assert primary key does not exist in habtm when the associati...Jeremy Kemper2009-11-231-13/+1
* Ruby 1.9.2: use recursive flattenJeremy Kemper2009-11-141-7/+1
* Ruby 1.9.2: fix flatten_deeper to preserve nilsJeremy Kemper2009-11-141-1/+1
* Revert "Split arel_table into method to get a relation and another to memoize...Jeremy Kemper2009-11-132-3/+3
* Split arel_table into method to get a relation and another to memoize the def...Jeremy Kemper2009-11-132-3/+3
* Ruby 1.9.2: avoid #flattenJeremy Kemper2009-11-131-4/+16
* Arel::In -> Arel::Predicates::InJeremy Kemper2009-11-022-2/+2
* Merge commit 'rails/master'Emilio Tagua2009-10-131-1/+1
|\
| * Callbacks, DeprecatedCallbacks = NewCallbacks, CallbacksJoshua Peek2009-10-121-1/+1
* | Merge commit 'rails/master'Emilio Tagua2009-10-021-0/+9
|\|
| * Make has_one with :conditions hash scope build or creation of the associated ...Luciano G Panaro2009-09-281-0/+9
* | Merge commit 'rails/master'Emilio Tagua2009-09-141-2/+2
|\|
| * Fix habtm associations when using multiple databasessdsykes2009-09-121-2/+2
* | Merge commit 'rails/master'Emilio Tagua2009-09-081-0/+16
|\|
| * Revert "Assert primary key does not exist in habtm when the association is de...Jeremy Kemper2009-09-021-0/+16
* | Merge commit 'rails/master'Emilio Tagua2009-09-011-16/+0
|\|
| * Assert primary key does not exist in habtm when the association is defined, i...José Valim2009-09-011-16/+0
* | Remove whitespace.Emilio Tagua2009-08-191-2/+2
* | Remove unused quoted_record_ids, now ARel does this using ARel::In.Emilio Tagua2009-08-181-9/+0
* | has_many nullify associations keys using ARel.Emilio Tagua2009-08-181-9/+9
* | habtm insertion with ARel integration.Emilio Tagua2009-08-181-8/+5
* | habtm delete method integrated with ARel.Emilio Tagua2009-08-181-4/+5
* | Merge commit 'rails/master'Emilio Tagua2009-08-101-19/+16
|\|
| * Remove unnecessary scoping for creating hm:t join recordPratik Naik2009-08-101-3/+4
| * Remove unnecessary scoping and validation checks from hm:t#createPratik Naik2009-08-101-1/+1
| * Unify hm:t#create and create! implementationPratik Naik2009-08-101-17/+13
* | Merge commit 'rails/master'Emilio Tagua2009-08-106-6/+34
|\|
| * raises an exception on habtm join table inserts if join table contains a prim...Jaime Bellmyer2009-08-091-2/+14
| * raises exception (ActiveRecord::ConfigurationError with message) on habtm ass...Jaime Bellmyer2009-08-091-0/+4
| * Fix that counter_cache breaks with has_many :dependent => :nullify.Gabe da Silveira2009-08-091-0/+1
| * has_many :through create should not raise validation errorsrailsbob2009-08-091-1/+5
| * Allow ho:through#build when the owner is a new record [#1749 state:resolved]Tristan Dunn2009-08-101-3/+9
| * Enable has_many :through for going through a has_one association on the join ...Gabe da Silveira2009-08-101-1/+1
| * Added back support for destroying an association's object by id. [#2306 statu...Joshua Nichols2009-08-091-0/+1
| * Ensure hm:t#find does not assign nil to :include [#1845 state:resolved]railsbob2009-08-091-1/+1
* | Merge commit 'rails/master'Emilio Tagua2009-08-101-0/+4
|\|
| * Ensure hm:t#create/create! throws ActiveRecord::RecordNotSaved when the owner...Pratik Naik2009-08-081-0/+4
* | Merge commit 'rails/master'Emilio Tagua2009-07-311-2/+2
|\|
| * Merge docrailsPratik Naik2009-07-251-2/+2
* | Merge commit 'rails/master'Emilio Tagua2009-07-162-5/+27
|\|
| * Add primary_key option to belongs_to associationSzymon Nowak2009-07-152-5/+27
* | Merge commit 'rails/master'Emilio Tagua2009-06-304-28/+16
|\|
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is a...Pratik Naik2009-07-014-28/+16
* | Merge commit 'rails/master'Emilio Tagua2009-06-231-0/+7
|\|
| * Revert "Generate proper :counter_sql from :finder_sql when there is a newline...Yehuda Katz + Carl Lerche2009-06-224-16/+28
| * Generate proper :counter_sql from :finder_sql when there is a newline charact...Patrick Joyce2009-06-214-28/+16