aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | to_key on a destroyed model should return nilSantiago Pastorino2011-07-091-1/+1
* | | | fix AR having() not to raise NoMethodError when the given argument does not r...Akira Matsuda2011-07-091-3/+3
* | | | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a...Jon Leighton2011-07-091-1/+11
| |_|/ |/| |
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-094-30/+30
|\ \ \
| * | | :conditions => whereAkira Matsuda2011-07-081-1/+1
| * | | :joins => joinsAkira Matsuda2011-07-081-12/+12
| * | | :include => includesAkira Matsuda2011-07-081-7/+7
| * | | find(:first) => firstAkira Matsuda2011-07-082-6/+6
| * | | find(:all) => allAkira Matsuda2011-07-083-22/+22
* | | | Destroy association habtm record before destroying the record itself. Fixes i...Tomas D'Stefano2011-07-082-12/+17
* | | | Ensure that the foreign key gets set when doing record.create_association or ...Jon Leighton2011-07-081-2/+11
* | | | Refactor PostgreSQLAdapter a bitDaniel Schierbeck2011-07-081-16/+18
* | | | Use Enumerable#with_index. We're on Ruby > 1.8.7Akira Matsuda2011-07-081-2/+1
* | | | Merge pull request #1997 from knapo/masterSantiago Pastorino2011-07-071-2/+0
|\ \ \ \
| * | | | Make `ActiveRecord::Batches#find_each` to not return `self`.knapo2011-07-071-2/+0
* | | | | Add require ActiveSupport delegation to ActiveRecord::Relation class.Dmitriy Kiriyenko2011-07-071-0/+1
|/ / / /
* | | | Merge pull request #1120 from lysenko/collection_singular_idsSantiago Pastorino2011-07-061-1/+1
|\ \ \ \
| * | | | Fix bug in collection_singular_ids on has many through association with condi...Anatoliy Lysenko2011-07-061-1/+1