aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing query when performing calculation with having based on select.Dmitriy Kiriyenko2011-07-271-0/+1
* Add a proxy_association method to association proxies, which can be called by...Jon Leighton2011-07-272-6/+16
* remove deprication warning for ruby 1.9.3-head for unused variablesVishnu Atrai2011-07-261-1/+1
* Revert "allow select to have multiple arguments"Piotr Sarnacki2011-07-261-6/+3
* Merge pull request #2271 from slawosz/enhance_select_method_apiPiotr Sarnacki2011-07-261-3/+6
|\
| * allow select to have multiple argumentsSławosz Sławiński2011-07-261-3/+6
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-251-1/+1
|\ \ | |/ |/|
| * Fixed TypoJohn2011-07-241-1/+1
* | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
* | Merge pull request #2236 from cldwalker/after_initializeSantiago Pastorino2011-07-251-2/+1
|\ \
| * | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-241-2/+1
* | | Bring back the ability to provide :order for update_all.thedarkone2011-07-251-9/+5
* | | Merge pull request #2238 from cesario/order-with-extra-spacesAaron Patterson2011-07-241-0/+1
|\ \ \ | |_|/ |/| |
| * | Ordering with extra spaces was raising a SQL exceptionFranck Verrot2011-07-241-0/+1
| |/
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-241-1/+1
|\ \ | |/ |/|
| * Changed a few instances of of words in the API docs written in British Englis...Oemuer Oezkir2011-07-241-1/+1
* | Merge pull request #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ \
| * | lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
* | | Merge pull request #2086 from amatsuda/date_multiparameter_nilXavier Noria2011-07-231-3/+6
|\ \ \
| * | | convert multiple Date parameters into a nil if any of its bits were blankAkira Matsuda2011-07-151-3/+6
* | | | Merge pull request #2171 from arunagw/database-rake-1.9.2Santiago Pastorino2011-07-231-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | This conditions is required to work with database create task. 1.9.2 is havin...Arun Agrawal2011-07-211-1/+2
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\ \ \ \
| * | | | use simpler words in docsVijay Dev2011-07-101-1/+1
* | | | | Fixes typoVijay Dev2011-07-221-1/+1
| |_|_|/ |/| | |
* | | | adding more tests around database uri parsingAaron Patterson2011-07-211-5/+3
* | | | Add documentation for URL connection strings.Glenn Gillen2011-07-201-0/+6
* | | | Added test for postgres connections as URL. Fixed query param parsing.Glenn Gillen2011-07-201-1/+1
* | | | Provide database connection settings as a URL.Glenn Gillen2011-07-201-0/+22
* | | | no need to sort the valuesAaron Patterson2011-07-201-1/+1
* | | | assign_nested_attributes_for_collection_association should work with Ruby 1.9...Franck Verrot2011-07-201-1/+1
* | | | bigdecimal should be typecast to a float on sqlite3. fixes #2162Aaron Patterson2011-07-201-0/+5
| |/ / |/| |
* | | avoid Symbol#to_procVijay Dev2011-07-201-1/+1
* | | Explicitly require Active Support dependenciesNorman Clarke2011-07-191-0/+2
* | | ActiveRecord: Fix eager loading so that giving a blank order clause generates...Elliot Winkler2011-07-181-1/+1
* | | Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-182-81/+1
|\ \ \
| * | | ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-172-81/+1
| * | | We already have the record; no need to retrieve it againJohn Firebaugh2011-07-171-2/+2
| | |/ | |/|
* | | Refactor the code a bit to reduce the duplicationPrem Sichanugrist2011-07-171-17/+8
* | | Raise an ArgumentError if user passing less number of argument in the dynamic...Prem Sichanugrist2011-07-171-0/+10
|/ /
* | Merge pull request #2063 from elight/masterSantiago Pastorino2011-07-141-1/+2
|\ \
| * | Fix and unit test for https://github.com/rails/rails/issues/2059Evan Light2011-07-141-1/+2
* | | Merge pull request #1807 from caius/find_in_batches_id_bugSantiago Pastorino2011-07-141-2/+5
|\ \ \ | |/ / |/| |
| * | Stop find_in_batches using the records after yielding.Caius Durling2011-06-211-2/+5
* | | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\ \ \
| * | | Fix for SqlBypass session storeJoseph Wong2011-07-121-7/+13
* | | | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-121-2/+6
|/ / /
* | | Fix exception if old and new targets are both nil. Fixes #1471.Jon Leighton2011-07-121-1/+1
* | | Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-101-2/+2
|\ \ \
| * | | Log instrumentation name for exists? queriesJon Guymon2011-06-221-2/+2