aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\
| * Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
* | 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-302-10/+23
|\
| * 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-291-1/+7
| * Do not add record to identity map if the record doesn't have values for all t...Arturo Pie2012-03-291-1/+1
* | 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-301-2/+3
| |/ |/|
* | Fix #5549.Jon Leighton2012-03-282-3/+7
* | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-271-0/+1
|\ \ | |/ |/|
| * force datetime attributes to be changedSergey Nartimov2012-03-271-0/+1
* | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
* | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|/
* migrate(:down) method with table_name_prefixkennyj2012-03-211-6/+22
* 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-151-1/+1
* 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-141-1/+1
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-131-1/+1
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-121-0/+16
* 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-122-1/+13
* Not need to pass join attributes to association buildRafael Mendonça França2012-03-082-4/+10
* make active_connection? return true only if there is an open connection in us...Aaron Patterson2012-03-081-3/+4
* Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-071-1/+1
* Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-051-1/+2
* fix associations when using per class databasesLars Kanis2012-03-043-8/+5
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-022-2/+2
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-011-1/+1
|\
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| * Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| * updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
* | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-291-9/+20
* | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-261-2/+2
* | Fixed typo in composed_of example with Money#<=>, was comparing amount itself...Noah Hendrix2012-02-251-1/+1
* | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
|/
* prepared statements can be disabledAaron Patterson2012-02-218-30/+56
* tag bind params with a bind param objectAaron Patterson2012-02-213-3/+3
* more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
* Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-211-16/+36
* Fix some warnings on 3-2-stablekennyj2012-02-211-1/+1
* Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redoJosé Valim2012-02-141-1/+4