aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Added test case to verify that transaction callbacks are correctly propagated...Tobias Lütke2010-08-091-0/+41
* move mysql2 adapter into coreBrian Lopez2010-08-091-0/+639
* ignore this test for mysql2Brian Lopez2010-08-091-13/+15
* bringing over latest from masterBrian Lopez2010-08-0945-1090/+1341
|\
| * adds missing requires for Object#tryXavier Noria2010-08-091-0/+1
| * Merge remote branch 'docrails/master'Xavier Noria2010-08-081-8/+5
| |\
| | * updating documentation for method configure_dependency_for_has_manyNeeraj Singh2010-08-061-8/+5
| * | reduce the number of times current_connection_id is called in with_connection()Aaron Patterson2010-08-061-4/+5
| * | test to ensure that respond_to? delegates to arelAaron Patterson2010-08-061-0/+19
| * | sorry AR, my privates are none of your businessAaron Patterson2010-08-061-7/+0
| * | do not rely on arel class structureAaron Patterson2010-08-062-1/+10
| |/
| * fixing whitespace errorsAaron Patterson2010-08-052-10/+10
| * avoid passing lists of lists to the group clauseAaron Patterson2010-08-041-1/+1
| * Merge remote branch 'docrails/master'Xavier Noria2010-08-058-17/+17
| |\
| | * standarizes the use of the article "an" for "SQL" and "SQLite"Xavier Noria2010-08-057-7/+7
| | * fixing documentationNeeraj Singh2010-08-033-12/+12
| * | call to_a since we are not passing anything to all()Aaron Patterson2010-08-041-1/+1
| * | fisting indentationAaron Patterson2010-08-041-3/+3
| * | do not pass AR objects to ARelAaron Patterson2010-08-041-0/+2
| * | I'm unsure how cloning was working in Rails 3 beforewycats2010-08-041-1/+1
| * | avoid passing AR::Base objects to Arel when we canAaron Patterson2010-08-031-0/+2
| * | query value is converted to_s instead of to_yamlRainerBlessing2010-08-032-1/+9
| * | Allow :name to be a Symbol (was this removed by accident?)wycats2010-08-031-0/+2
| * | order query is already a string, no need to to_sAaron Patterson2010-08-031-2/+2
| * | Dynamic finder method like scoped_by_* create methods so thatNeeraj Singh2010-08-031-0/+6
| * | Making Active Record base_test.rb thinner by moving testsNeeraj Singh2010-08-035-534/+545
| |/
| * Merge remote branch 'docrails/master' into 3-0-stableXavier Noria2010-08-0326-497/+707
| |\
| | * Correcting the documentation which wrongly states that each dynamic finder cr...Neeraj Singh2010-08-021-7/+4
| | * Adding to AR::Base documentation about dynamically scopeded_by queryNeeraj Singh2010-08-022-11/+19
| | * ensuring that description does not exceed 100 columnsNeeraj Singh2010-08-0219-138/+205
| | * updating documentation to ensure line does not exceed 100 columnsNeeraj Singh2010-08-022-94/+136
| | * ensuring that documentation does not exceed 100 columnsNeeraj Singh2010-08-013-194/+282
| | * ensuring that documentation does not exceed 100 columnsNeeraj Singh2010-07-311-51/+65
| | * adding the missing closing tagNeeraj Singh2010-07-311-1/+1
| | * fixing documentation just a little bitNeeraj Singh2010-07-312-22/+16
* | | skip the before_type_cast_on_datetime test entirely for mysql2Brian Lopez2010-08-021-17/+18
* | | move reload after touchBrian Lopez2010-08-021-1/+1
* | | reload the owner model after updateBrian Lopez2010-08-021-0/+1
* | | Merge branch 'master' into mysql2Brian Lopez2010-08-0214-37/+146
|\| |
| * | Remove duplicated logic.José Valim2010-08-021-7/+9
| * | Eager loading an association should not change the count of childrenNeeraj Singh2010-08-026-0/+42
| * | Tidy up previous commit.José Valim2010-08-023-18/+16
| * | test and fix collection_singular_ids= with string primary keys [#5125 state:r...Robert Pankowecki2010-08-024-3/+46
| * | Add an internal (private API) after_touch callback. [#5271 state:resolved]José Valim2010-08-025-19/+24
| * | added failing touch propagation testJakub Kuźma2010-08-022-0/+19
| |/
* / update tests for mysql2 supportBrian Lopez2010-08-0216-26/+466
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-315-26/+29
|\
| * reverting where() functionality, adding a testAaron Patterson2010-07-302-4/+9
| * fewer method calls, using faster methods when possibleAaron Patterson2010-07-301-5/+5
| * reducing function calls and using faster methods for testingAaron Patterson2010-07-302-16/+10