aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7983 from georgebrock/bug7950-squashedCarlos Antonio da Silva2012-11-166-12/+35
|\
| * use bind values for join columnsAaron Patterson2012-11-106-12/+36
* | Merge pull request #8209 from senny/backport_8176Rafael Mendonça França2012-11-131-1/+3
|\ \
| * | backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-131-1/+3
* | | Merge pull request #8204 from nikitug/fix_dynamic_finder_result_checkRafael Mendonça França2012-11-131-1/+1
|\ \ \
| * | | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-131-1/+1
* | | | Fix deleting from a HABTM join table upon destroying an object of a model wit...Nick Rogers2012-11-131-0/+2
|/ / /
* / / Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only da...kennyj2012-11-141-6/+6
|/ /
* | Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-121-1/+9
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\ \ | |/ |/|
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
* | Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-11-091-0/+10
* | Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_wi...Santiago Pastorino2012-11-081-2/+2
|\ \
| * | Fix find_in_batches against string IDs when start option is not specified.Alexis Bernard2012-11-081-2/+2
| * | start could be a stringSantiago Pastorino2012-11-081-1/+1
| |/
* / Fix accepts_nested_attributes for child classesGabriel Sobrinho & Ricardo Henrique2012-11-071-3/+4
|/
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Ensure calling first/last with options correctly set inverse associationCarlos Antonio da Silva2012-11-011-1/+3
* Fix issue with collection associations and first(n)/last(n)Carlos Antonio da Silva2012-11-011-1/+1
* Fix ActiveRecord#update_column return valuesaksmlz2012-10-311-1/+1
* Fix typo :bomb: [ci skip]Rafael Mendonça França2012-10-291-1/+1
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-291-2/+13
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-292-35/+55
|\
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-35/+55
* | Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|/
* Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-291-1/+1
* Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-291-1/+5
* Make Active Record tests pass in isolationRafael Mendonça França2012-10-291-2/+1
* Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-281-0/+2
* frozen state should be restored after txn is abortedAaron Patterson2012-10-221-2/+3
* Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951Martin Grandrath2012-10-181-1/+1
* Merge pull request #7371 from csmuc/fix_dup_validation_errorsSantiago Pastorino2012-10-171-0/+1
* Synchronize around deleting from the reserved connections hash.Aaron Patterson2012-10-151-1/+1
* 7914 Using a better way to get the defaults from db.Arturo Pie2012-10-141-12/+7
* #7914 get default value when type uses schema nameArturo Pie2012-10-141-1/+1
* Fix has_many assocation w/select load after createErnie Miller2012-10-121-1/+1
* Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
* Eager autoload ActiveRecord association helpersMichael Fairley2012-10-101-5/+7
* Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_...Rafael Mendonça França2012-10-061-1/+1
* Merge pull request #6978 from frodsan/count_nosql_unsaved_parentRafael Mendonça França2012-10-041-0/+2
* RefactorSantiago Pastorino2012-10-031-5/+3
* Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-throughRafael Mendonça França2012-10-021-2/+8
* backport 68677ffb8298105eb9d3efa26d928dd88cc5e006Evan Petrie2012-09-282-6/+5
* ConnectionPool accepts spec key 'checkout_timeout'Jonathan Rochkind2012-09-241-3/+9
* Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-212-4/+4
* Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-201-190/+49
* Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
* backport fair connection pool 02b2335563 to 3-2-stableJonathan Rochkind2012-09-171-49/+190