aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-222-2/+7
* Do not in place modify what table_name returnsSantiago Pastorino2011-03-221-1/+1
* Merge branch 'master' into fuuuAaron Patterson2011-03-228-17/+57
|\
| * pushing id insertion and prefetch primary keys down to Relation#insertAaron Patterson2011-03-224-12/+23
| * use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| * escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#655...Aaron Patterson2011-03-211-0/+8
| * schemas set by set_table_name are respected by the mysql adapter. [#5322 stat...Aaron Patterson2011-03-211-2/+16
| * Reapply extensions when using except and onlyIain Hecker2011-03-211-0/+6
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-165-10/+20
|\|
| * 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
| * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-121-1/+4
| * | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
| |/
| * Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-071-1/+12
* | Fix tests under postgres - we should always put conditions in the WHERE part ...Jon Leighton2011-03-123-18/+22
* | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
* | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-111-22/+2
* | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-114-97/+83
* | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
* | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-104-45/+48
* | 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-071-1/+12
* | 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-056-9/+19
|\|
| * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| * Active Record typos.R.T. Lechow2011-03-053-4/+4
| * 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-051-0/+10
| * When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-041-2/+4
| * 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-053-45/+11
* | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-052-13/+25
* | 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-041-2/+4
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-0/+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-04101-4174/+5652
|\|
| * Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-2811-626/+618
| * Rewrote AssociationPreload.Jon Leighton2011-02-2817-440/+565
| * use an attribute rather than a SQL literalAaron Patterson2011-02-261-1/+1
| * removing limits and offsets from COUNT queries unless both are specified. [#6...Aaron Patterson2011-02-252-1/+14
| * 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-241-2/+3