aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-183-20/+2
* Check for nil loggerNorman Clarke2012-04-181-1/+1
* Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\
| * Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
* | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
* | log which config format AR uses to connect withTerence Lee2012-04-031-0/+4
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\
| * refactor instantiate method in base, so we remove nesting if's which make the...Arturo Pie2012-03-292-12/+19
| * refactor the checking of the attributes of the record in IdentityMap#add, so ...Arturo Pie2012-03-292-5/+12
| * Do not add record to identity map if the record doesn't have values for all t...Arturo Pie2012-03-291-1/+1
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-301-1/+1
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-303-2/+20
| |/ |/|
* | Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\ \
| * | Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
| |/
* | Fix #5549.Jon Leighton2012-03-282-3/+7
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
* | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-281-2/+2
* | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-272-0/+15
|\ \ | |/ |/|
| * force datetime attributes to be changedSergey Nartimov2012-03-272-0/+15
* | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
* | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|/
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-232-6/+34
|\
| * migrate(:down) method with table_name_prefixkennyj2012-03-212-6/+34
* | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
* | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
* | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating...Marcelo Silveira2012-03-211-0/+3
* | [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-201-1/+1
|/
* Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-181-0/+1
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
* ConnectionPool.checkout takes account of ruby using 'non-blocking condition v...Jonathan Rochkind2012-03-131-9/+18
* [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Co...kennyj2012-03-142-2/+8
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-0/+26
* Merge pull request #5391 from jrochkind/connection_pool_docAaron Patterson2012-03-121-3/+1
|\
| * inline docs for clear_active_connections! no longer says it cleans dead threa...Jonathan Rochkind2012-03-121-3/+1
* | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-121-0/+3
|/
* Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-1/+67
* Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\
| * Not need to pass join attributes to association buildRafael Mendonça França2012-03-085-16/+21
| * Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-084-4/+34
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-2/+11
|/
* ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
* make active_connection? return true only if there is an open connection in us...Aaron Patterson2012-03-082-3/+46
* changelog updates [ci skip]Vijay Dev2012-03-091-0/+14
* Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
* Add tests to test that through associations are not readonly, and we can upda...kuahyeow2012-03-081-0/+11