aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when...Aaron Patterson2012-05-161-2/+6
|\ \
| * | when using a preloaded array and the uniq flag is set then return the size of...Jon Rowe2012-03-151-2/+6
* | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-161-0/+2
* | | Remove #=== quirkJon Leighton2012-05-111-6/+0
* | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
* | | extract deprecated codeJon Leighton2012-05-111-8/+1
* | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
* | | CollectionProxy < RelationJon Leighton2012-05-112-22/+23
* | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-052-7/+2
* | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-052-2/+7
|\ \ \
| * | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-042-2/+7
* | | | extract code from AR::BaseJon Leighton2012-05-041-1/+1
* | | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-041-3/+3
|/ / /
* | | Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-021-2/+2
* | | allow AssociationProxy#scoped to take options so that API is the same as Base...Jon Leighton2012-04-271-2/+6
* | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \ \
| * | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
* | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-254-4/+6
|\ \ \ \
| * | | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-131-1/+2
| * | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
* | | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-131-7/+8
|/ / / /
* | | | Some refactor for association.kennyj2012-04-123-8/+7
* | | | Get a properly aliased_table_name, when we use a polymorphic association.kennyj2012-04-041-1/+1
|/ / /
* / / Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-301-2/+3
|/ /
* | Remove IdentityMapCarlos Antonio da Silva2012-03-131-12/+1
* | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] c...Alexey Vakhov2012-03-091-1/+1
* | Not need to pass join attributes to association buildRafael Mendonça França2012-03-072-4/+10
* | Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-051-1/+2
* | Initialize @stale_state to nil in associationCarlos Antonio da Silva2012-03-041-0/+1
* | Revert "only mutate the scope object in the `bind` method"Aaron Patterson2012-02-271-1/+1
* | only mutate the scope object in the `bind` methodAaron Patterson2012-02-271-1/+1
* | bind value creation refactoringAaron Patterson2012-02-271-4/+10
* | removing dead codeAaron Patterson2012-02-271-3/+2
* | use bind values for join columnsAaron Patterson2012-02-271-1/+16
* | fix associations when using per class databasesLars Kanis2012-02-103-8/+5
* | Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-011-2/+1
|\ \ | |/ |/|
| * Don't instantiate two objects in collection proxy / find_or_instantiator_byJonathan del Strother2012-01-191-2/+1
* | Use human attribute name to show the dependent destroy messageRafael Mendonça França2012-02-011-1/+2
* | fix has_one, has_many restrict error messageManoj2012-02-011-1/+2
* | Merge pull request #4799 from arunagw/warning_fixed_for_indentationsAaron Patterson2012-01-311-1/+1
|\ \
| * | warning removed: mismatched indentationsArun Agrawal2012-01-311-1/+1
* | | Put spaces between the words at deprecation warningRafael Mendonça França2012-01-311-3/+3
|/ /
* | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-311-1/+1
|\ \
| * | ids_reader method fixed, test added to has_many associationgregolsen2012-01-311-1/+1
| |/
* | suggested fixes for :dependent => :restrict deprecation.Manoj2012-01-311-1/+1
* | Same method for has_many and has_one associationsPaco Guzman2012-01-313-30/+17
* | Easy dependent_restrict error messagePaco Guzman2012-01-312-4/+2
* | has_many/has_one, :dependent => :restrict, deprecation added.Manoj2012-01-293-3/+35
|/
* Deprecate inferred JOINs with includes + SQL snippets.Jon Leighton2012-01-162-2/+2
* Avoid sanitize_sql when we can use Relation#where insteadJon Leighton2012-01-164-22/+16