aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Add order clauses to fix some tests which were failing under 1.8 on oracle an...Jon Leighton2011-03-182-14/+14
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-166-10/+46
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-143-8/+15
| |\
| | * Adjust unique constraint comment to include info about the RecordNotUnique ex...Anders Elfving2011-03-131-4/+11
| | * remove some blanksPaco Guzman2011-03-112-4/+4
| * | Remove invalid testAndrew White2011-03-131-5/+1
| * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-122-1/+34
| * | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
* | | oracle, y u defy meJon Leighton2011-03-165-13/+15
* | | Fix tests under postgres - we should always put conditions in the WHERE part ...Jon Leighton2011-03-124-19/+23
* | | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
* | | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-112-23/+3
* | | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-114-97/+83
* | | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-102-2/+2
|\| |
| * | revises links to the API websites of individual components (no longer maintai...Xavier Noria2011-03-091-1/+1
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-071-1/+1
| |\
| | * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| * | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| |/
* | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-105-50/+53
* | Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-109-215/+162
* | Fix test_has_many_association_through_a_has_many_association_with_nonstandard...Jon Leighton2011-03-072-2/+2
* | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
* | Refactor ThroughAssociation#join_to to be much smaller, and independent of co...Jon Leighton2011-03-062-84/+34
* | Refactor ThroughAssociation#tables to just be a flat array of tables in the o...Jon Leighton2011-03-061-75/+70
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0511-15/+33
|\|
| * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| * Active Record typos.R.T. Lechow2011-03-056-10/+10
| * fixes a missmatched column in examplemjy2011-03-051-1/+1
| * implements ActiveRecord::Base.connection_config to be able to check the confi...Xavier Noria2011-03-053-0/+18
| * When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-042-2/+20
| * Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
* | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
* | Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-054-47/+13
* | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-056-13/+46
* | Stop identity-mapping the through records in the preloader since I fixed the ...Jon Leighton2011-03-041-5/+0
* | Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
* | When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-042-2/+20
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-042-4/+5
|\|
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ActiveReco...Alexander Uvarov2011-03-011-0/+11
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04207-5362/+9286
|\|
| * Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-2811-626/+618
| * Rewrote AssociationPreload.Jon Leighton2011-02-2821-458/+583
| * skip this on oracleAaron Patterson2011-02-281-0/+2
| * use an attribute rather than a SQL literalAaron Patterson2011-02-262-1/+2
| * removing limits and offsets from COUNT queries unless both are specified. [#6...Aaron Patterson2011-02-254-1/+51
| * only take the limit if there is a limit to takeAaron Patterson2011-02-251-1/+1
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-251-1/+1
| |\
| | * Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
| * | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclassesEric Allam2011-02-242-2/+7