aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #1989 from simonbaird/masterSantiago Pastorino2011-07-061-5/+8
|\ \ \ \ \
| * | | | | Fix charset/collate in mysql recreate_databaseSimon Baird2011-07-071-5/+8
* | | | | | Don't construct association scope in initializer. This yields a big performan...Jon Leighton2011-07-072-7/+11
* | | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.Ernie Miller2011-07-061-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #1273 from jeremyf/feature-association-proxy-sendSantiago Pastorino2011-07-062-1/+2
|\ \ \ \ \
| * | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ...Jeremy Friesen2011-05-242-1/+2
* | | | | | Merge pull request #1979 from bogdan/association_sum_array_compatibilityJon Leighton2011-07-061-2/+6
|\ \ \ \ \ \
| * | | | | | Fixed AR::Relation#sum compatibility with Array#sumBogdan Gusiev2011-07-051-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1968 from bogdan/associations_find_array_compatibility2Santiago Pastorino2011-07-051-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed CollectionAssociation#find to be compatible with Array#findBogdan Gusiev2011-07-051-3/+7
* | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-052-6/+6
|\ \ \ \ \ \
| * | | | | | minor changesVijay Dev2011-06-271-2/+2
| * | | | | | replace find(all) with allVijay Dev2011-06-261-3/+3
| * | | | | | fix typo in method nameVijay Dev2011-06-251-1/+1
| * | | | | | Revert "add missing methods supported by reversible migrations using the chan...Vijay Dev2011-06-251-4/+1
| * | | | | | add missing methods supported by reversible migrations using the change methodVijay Dev2011-06-241-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Only call set_owner_attributes for has_one association if target exists.Dieter Komendera2011-07-041-1/+1
| |/ / / / |/| | | |