Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 1 | -0/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -1/+1 |
| | | |||||
* | | Active Record Associations - minor change of DeleteRestrictionError doc for ↵ | Bryan Woods | 2010-06-15 | 1 | -1/+1 |
| | | | | | | | | clarity | ||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 1 | -5/+5 |
|\ \ | |/ |/| | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -5/+5 |
| | | |||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 1 | -2/+2 |
|/ | | | | not "ActiveRecord" | ||||
* | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 1 | -2/+2 |
| | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 1 | -1/+2 |
|\ | |||||
| * | Downcase quoted table name in regex in count_aliases_from_table_joins | Raimonds Simanovskis | 2010-06-04 | 1 | -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 Meier | 2010-06-07 | 1 | -0/+1 |
|/ | | | | | | associations.rb Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-05-17 | 1 | -1/+1 |
|\ | |||||
| * | Fix for get_ids when including a belongs_to association on a has_many ↵ | Diego Algorta | 2010-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | better documentation for dependent option [#4564 state:resolved] | Neeraj Singh | 2010-05-16 | 1 | -4/+5 |
|/ | |||||
* | eliminate alias_method_chain from ActiveRecord | wycats | 2010-05-09 | 1 | -8/+8 |
| | |||||
* | Fix eager loading of associations causing table name collisions | Ernie Miller | 2010-04-28 | 1 | -17/+60 |
| | | | | | | [#4463 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Destroy respects optimistic locking. | Curtis Hawthorne | 2010-04-27 | 1 | -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 Kemper | 2010-04-10 | 1 | -3/+4 |
| | |||||
* | Bring back +extra_conditions+. This effectively reverts ↵ | Carl Lerche | 2010-04-03 | 1 | -3/+3 |
| | | | | 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57 | ||||
* | Make the query built by has_many ...., :dependent => :____ lazy since all ↵ | Carl Lerche | 2010-04-02 | 1 | -50/+22 |
| | | | | the information is not really available yet. | ||||
* | Remove an unused argument | Carl Lerche | 2010-04-02 | 1 | -2/+1 |
| | |||||
* | Fix honoring :primary_key option when joining or eager loading a belongs_to ↵ | Ernie Miller | 2010-03-29 | 1 | -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 Reza | 2010-03-28 | 1 | -2/+37 |
| | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | |||||
* | avoiding a few closure references by evaling. [#4223 state:resolved] | Aaron Patterson | 2010-03-27 | 1 | -12/+18 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 1 | -9/+0 |
|\ | |||||
| * | Move methods from association to relation finder methods. | Emilio Tagua | 2010-03-25 | 1 | -9/+0 |
| | | |||||
* | | fix habtm documentation to correct typo | Jeremy Roman | 2010-03-26 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
* | cleaning up some test warnings | Aaron Patterson | 2010-03-14 | 1 | -2/+5 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Fix associations to call :destroy or :delete based on the right :dependent ↵ | Carlos Antonio da Silva | 2010-03-09 | 1 | -3/+3 |
| | | | | | | option Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | drying up more code in associations.rb | Aaron Patterson | 2010-03-06 | 1 | -17/+11 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | deleting repeated code | Aaron Patterson | 2010-03-06 | 1 | -17/+7 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Remove find_with_associations and related code from associations now that ↵ | Pratik Naik | 2010-01-20 | 1 | -67/+0 |
| | | | | Relation handles that stuff | ||||
* | Simplify construct_finder_arel_* methods | Pratik Naik | 2010-01-18 | 1 | -27/+7 |
| | |||||
* | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -5/+3 |
| | |||||
* | Rename Model.active_relation to Model.unscoped | Pratik Naik | 2010-01-17 | 1 | -2/+2 |
| | |||||
* | Rename active_relation_engine -> arel_engine and active_relation_table -> ↵ | Pratik Naik | 2010-01-16 | 1 | -8/+8 |
| | | | | arel_table | ||||
* | Make scopes use relations under the hood | Pratik Naik | 2010-01-16 | 1 | -123/+96 |
| | |||||
* | Ensure using proper engine for Arel::Table | Pratik Naik | 2010-01-12 | 1 | -4/+4 |
| | |||||
* | Delay building arel relation as long as possible for improved introspection | Pratik Naik | 2010-01-12 | 1 | -7/+8 |
| | |||||
* | Renamed AssociationReflection #collection_association? to #collection?. | Eloy Duran | 2010-01-08 | 1 | -3/+3 |
| | |||||
* | Cleanup some code in nested_attributes.rb, autosave_association.rb, and ↵ | Eloy Duran | 2010-01-07 | 1 | -4/+3 |
| | | | | | | associations.rb with AssociationReflection#collection_association? Also cache the result value. | ||||
* | Reapply "Remove optional join_dependency argument as Relation always ↵ | Pratik Naik | 2010-01-03 | 1 | -2/+1 |
| | | | | supplies it" - Now without syntax errors | ||||
* | Revert "Remove optional join_dependency argument as Relation always supplies it" | Jeremy Kemper | 2010-01-02 | 1 | -1/+2 |
| | | | | This reverts commit 8e57deed8b4efad6ea1c551f415b74596111f890. | ||||
* | Remove optional join_dependency argument as Relation always supplies it | Pratik Naik | 2010-01-03 | 1 | -2/+1 |
| | |||||
* | Remove unused code from association.rb now that Relation takes care of ↵ | Pratik Naik | 2010-01-03 | 1 | -78/+0 |
| | | | | checking the referenced tables | ||||
* | Simply methods for checking eager loaded tables references in the query | Pratik Naik | 2010-01-03 | 1 | -7/+7 |
| | |||||
* | Rename Model.arel_table to Model.active_relation | Pratik Naik | 2010-01-02 | 1 | -2/+2 |
| | |||||
* | Remove unncessary arguments passed to arel_table | Pratik Naik | 2010-01-01 | 1 | -1/+2 |
| |