aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6197 from blakesmith/connection_adapters_without_explain_...Xavier Noria2013-01-222-6/+14
* Revert "Merge pull request #6986 from kennyj/fix_6975"Andrew White2013-01-221-14/+5
* Revert "Work around undiagnosed bug that's draining a relation's bind_values"Carlos Antonio da Silva2013-01-151-1/+0
* Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"Carlos Antonio da Silva2013-01-156-35/+12
* Revert "Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt"Ernie Miller2013-01-111-14/+0
* Ignore binds payload with nil column in AR log subscriberYasuo Honda2013-01-091-1/+5
* Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-082-2/+7
|\
| * bumping versionAaron Patterson2013-01-081-1/+1
| * * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-081-1/+6
* | Refactor write attribute logic to convert number column valueCarlos Antonio da Silva2013-01-071-4/+5
* | Fix named scope + class method exampleCarlos Antonio da Silva2013-01-071-3/+1
* | connection_parameters is an Array and will never haveRafael Mendonça França2013-01-061-2/+0
* | Fix error when assigning NaN to an integer columnTristan Harward2013-01-061-5/+1
* | Fix undefined method `to_i' introduced since 3.2.8Jason Stirk2013-01-041-1/+5
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\|
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-1/+6
|\|
| * CVE-2012-5664 options hashes should only be extracted if there are extra para...Aaron Patterson2012-12-231-1/+6
* | Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-211-0/+8
* | Backport #8522, Keep index names when using with sqlite3Yves Senn2012-12-191-1/+1
* | recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-131-1/+1
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-101-1/+12
* | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-12-101-1/+1
* | Unscope update_column(s) query to ignore default scopeCarlos Antonio da Silva2012-12-061-1/+1
* | Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-041-3/+2
* | backport #8403, no intermediate AR objects when eager loading.Yves Senn2012-12-041-2/+4
* | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-12-031-1/+6
* | handled respond_to? with private methodsSHIBATA Hiroshi2012-12-031-1/+1
* | Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-11-301-3/+7
* | Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases ...Jeremy Kemper2012-11-291-5/+19
* | Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fixAaron Patterson2012-11-281-1/+1
|\ \
| * | Making test accurately reflect what is going on in the schema migrations testChris Barton2012-09-181-1/+1
* | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-11-281-0/+1
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-261-1/+20
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-251-1/+1
* | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-251-1/+1
* | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-251-0/+1
* | | backport #8291, prevent mass assignment of polymorphic type with `build`Yves Senn2012-11-221-1/+2
* | | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-201-0/+7
* | | Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
* | | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|