aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
Commit message (Collapse)AuthorAgeFilesLines
* Added missing require of remove_methodŁukasz Strzałkowski2010-07-191-0/+1
|
* Make use of redefine_method, removed some more redefining warningsŁukasz Strzałkowski2010-07-191-27/+12
|
* Removed warnings about method redefiningŁukasz Strzałkowski2010-07-191-9/+24
|
* JoinDependency#graft does not properly set parent join [#5124 state:resolved]David Genord II2010-07-161-1/+1
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* clean up ||= with an initialized variable and attr_readerAaron Patterson2010-07-141-5/+2
|
* Merge remote branch 'docrails/master'Xavier Noria2010-07-071-0/+4
|\
| * added more info about << operation in associationsNeeraj Singh2010-07-061-0/+4
| |
* | documents automatic management of join models in hmt associations, in ↵Xavier Noria2010-07-061-4/+11
|/ | | | particular the gotcha that deletion is direct
* Improve documentation for assocations :autosave option.Edgars Beigarts2010-06-221-4/+12
|
* Merge remote branch 'rails/master'Xavier Noria2010-06-201-1/+1
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-201-0/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-191-1/+1
| |
* | Active Record Associations - minor change of DeleteRestrictionError doc for ↵Bryan Woods2010-06-151-1/+1
| | | | | | | | clarity
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-151-5/+5
|\ \ | |/ |/|
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-111-5/+5
| |
* | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-141-2/+2
|/ | | | not "ActiveRecord"
* Fix multiple self-referencing eager loads failing to join multiple timesErnie Miller2010-06-081-2/+2
| | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge remote branch 'rsim/oracle_enhanced_rails3'wycats2010-06-071-1/+2
|\
| * Downcase quoted table name in regex in count_aliases_from_table_joinsRaimonds Simanovskis2010-06-041-1/+2
| | | | | | | | Oracle adapter's quote_table_name returns quoted table name in uppercase and therefore it should be downcased before scanning downcased join_sql
* | Require active support/string/conversions so constantize can be used in ↵Tom Meier2010-06-071-0/+1
|/ | | | | | associations.rb Signed-off-by: José Valim <jose.valim@gmail.com>
* refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-201-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-171-1/+1
|\
| * Fix for get_ids when including a belongs_to association on a has_many ↵Diego Algorta2010-05-151-1/+1
| | | | | | | | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | better documentation for dependent option [#4564 state:resolved]Neeraj Singh2010-05-161-4/+5
|/
* eliminate alias_method_chain from ActiveRecordwycats2010-05-091-8/+8
|
* Fix eager loading of associations causing table name collisionsErnie Miller2010-04-281-17/+60
| | | | | | [#4463 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Destroy respects optimistic locking.Curtis Hawthorne2010-04-271-1/+10
| | | | | | | | | | Now works with :dependent => :destroy and includes unit tests for that case. Also includes better error messages when updating/deleting stale objects. [#1966 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Avoid deprecated String#to_a by using Array.wrap(...) instead of Array(...)Jeremy Kemper2010-04-101-3/+4
|
* Bring back +extra_conditions+. This effectively reverts ↵Carl Lerche2010-04-031-3/+3
| | | | 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57
* Make the query built by has_many ...., :dependent => :____ lazy since all ↵Carl Lerche2010-04-021-50/+22
| | | | the information is not really available yet.
* Remove an unused argumentCarl Lerche2010-04-021-2/+1
|
* Fix honoring :primary_key option when joining or eager loading a belongs_to ↵Ernie Miller2010-03-291-1/+1
| | | | | | | | association [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add :dependent = to has_one and has_many [#3075 state:resolved]Rizwan Reza2010-03-281-2/+37
|
* adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-281-0/+1
|
* avoiding a few closure references by evaling. [#4223 state:resolved]Aaron Patterson2010-03-271-12/+18
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Merge branch 'master' into docrailswycats2010-03-261-9/+0
|\
| * Move methods from association to relation finder methods.Emilio Tagua2010-03-251-9/+0
| |
* | fix habtm documentation to correct typoJeremy Roman2010-03-261-1/+1
|/ | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
* cleaning up some test warningsAaron Patterson2010-03-141-2/+5
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Fix associations to call :destroy or :delete based on the right :dependent ↵Carlos Antonio da Silva2010-03-091-3/+3
| | | | | | option Signed-off-by: José Valim <jose.valim@gmail.com>
* drying up more code in associations.rbAaron Patterson2010-03-061-17/+11
| | | | Signed-off-by: wycats <wycats@gmail.com>
* deleting repeated codeAaron Patterson2010-03-061-17/+7
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Remove find_with_associations and related code from associations now that ↵Pratik Naik2010-01-201-67/+0
| | | | Relation handles that stuff
* Simplify construct_finder_arel_* methodsPratik Naik2010-01-181-27/+7
|
* Merge docrailsPratik Naik2010-01-171-5/+3
|
* Rename Model.active_relation to Model.unscopedPratik Naik2010-01-171-2/+2
|
* Rename active_relation_engine -> arel_engine and active_relation_table -> ↵Pratik Naik2010-01-161-8/+8
| | | | arel_table
* Make scopes use relations under the hoodPratik Naik2010-01-161-123/+96
|
* Ensure using proper engine for Arel::TablePratik Naik2010-01-121-4/+4
|
* Delay building arel relation as long as possible for improved introspectionPratik Naik2010-01-121-7/+8
|