aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge pull request #2017 from Casecommons/active_record_lintJosé Valim2011-07-082-0/+12
|\ \ | | | | | | ActiveRecord::Base subclasses should pass ActiveModel::Lint.
| * | ActiveRecord::Base should pass ActiveModel::Lint.Grant Hutchins & Peter Jaros2011-07-082-0/+12
| | |
* | | Destroy association habtm record before destroying the record itself. Fixes ↵Tomas D'Stefano2011-07-084-12/+29
| | | | | | | | | | | | issue #402.
* | | Ensure that the foreign key gets set when doing record.create_association or ↵Jon Leighton2011-07-082-2/+25
| | | | | | | | | | | | record.create_association. Fixes #1960.
* | | Refactor PostgreSQLAdapter a bitDaniel Schierbeck2011-07-082-18/+20
|/ / | | | | | | | | Move the private method #extract_schema_and_table into a separate Utils module so that it can be tested without resorting to #send.
* | Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II)Akira Matsuda2011-07-081-3/+1
| |
* | 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-072-2/+7
|\ \ | | | | | | Make `ActiveRecord::Batches#find_each` to not return `self`.
| * | Make `ActiveRecord::Batches#find_each` to not return `self`.knapo2011-07-072-2/+7
| | | | | | | | | | | | This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
* | | 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-062-1/+6
|\ \ | | | | | | collection_singular_ids ignores association :include option
| * | Fix bug in collection_singular_ids on has many through association with ↵Anatoliy Lysenko2011-07-062-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions and includes, when condtions references tables from includes. Test fail because of invalid sql: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id: SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id" WHERE "readers"."person_id" = 1 AND (comments.id is null) Bug described in github#925 This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok. Bug described in #6569 ticket.
* | | Merge pull request #1989 from simonbaird/masterSantiago Pastorino2011-07-061-5/+8
|\ \ \ | | | | | | | | rake db:test:purge creates mysql database with wrong charset & collation (master branch)
| * | | Fix charset/collate in mysql recreate_databaseSimon Baird2011-07-071-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See new method mysql_creation_options. It is used by both create_database and recreate_database so they are consistent. (Cherry pick of 3ba3125b24b532876c95c8d9d00c9b69faab5a60)
* | | | Don't construct association scope in initializer. This yields a big ↵Jon Leighton2011-07-072-7/+11
| | | | | | | | | | | | | | | | performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.
* | | | 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-063-1/+11
|\ \ \ | | | | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handl
| * | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ↵Jeremy Friesen2011-05-243-1/+11
| | | | | | | | | | | | | | | | of dynamic finder methods and the passing of the &block parameter for :find_by_attributes.
* | | | Merge pull request #1494 from anildigital/masterSantiago Pastorino2011-07-061-2/+2
|\ \ \ \ | | | | | | | | | | Fix failing test because of Timezone difference.
| * | | | Fix failing test because of Timezone difference.Anil Wadghule2011-06-051-2/+2
| | | | |
* | | | | Merge pull request #1979 from bogdan/association_sum_array_compatibilityJon Leighton2011-07-062-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum
| * | | | | Fixed AR::Relation#sum compatibility with Array#sumBogdan Gusiev2011-07-052-2/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | In order make Relation behavior closer to Array Made Relation#sum to accept block and delegate it to Array#sum
* | | | | Merge pull request #1968 from bogdan/associations_find_array_compatibility2Santiago Pastorino2011-07-052-3/+11
|\ \ \ \ \ | |/ / / / |/| | | | Fixed CollectionAssociation#find to be compatible with Array#find
| * | | | Fixed CollectionAssociation#find to be compatible with Array#findBogdan Gusiev2011-07-052-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | In order to make CollectionAssociation behave closer to Array Add the ability to pass block to #find method just like Array#find does.
* | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-052-6/+6
|\ \ \ \ \
| * | | | | Revert "fix a typo"Vijay Dev2011-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Changelogs are not to be changed in docrails. This reverts commit 0b8cdc16e0b7c3404a0e3470b580235023c53542.
| * | | | | fix a typoRay Baxter2011-07-011-1/+1
| | | | | |
| * | | | | 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 ↵Vijay Dev2011-06-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change method" This reverts commit 7f91eebae361f2f3a1558f6d899b372524509a2d. Reason: Incorrect documenting. The newly added methods to the list are not actually supported by reversible migrations.
| * | | | | 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-042-1/+12
| |/ / / / |/| | | |
* | | | | Use an instance variable to store the current masss assignment optionsAndrew White2011-07-042-13/+18
| |_|_|/ |/| | |
* | | | Reversing the changes done in c278a2c while still resolving #1857.Vijay Dev2011-07-022-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes broke bulk migration tests and were fixed in 4d256bc6; however that brought back the issue of #1857 and so this commit goes back to the original scenario and just adds change_table to the list of methods which are to be recorded in the CommandRecorder. The method_missing now delegates all calls to the underlying connection as before.
* | | | a few minor performance improvements: fewer strings, fewer range objects, ↵Aaron Patterson2011-07-012-22/+13
| | | | | | | | | | | | | | | | fewer method calls
* | | | calling super is super. if the other object is exactly equal, we can return ↵Aaron Patterson2011-07-011-1/+5
| | | | | | | | | | | | | | | | early
* | | | remove unused codesAaron Patterson2011-07-011-4/+0
| | | |
* | | | reduce calls to owners_by_key and to read_attribute, respond_to? etcAaron Patterson2011-07-011-2/+3
| | | |
* | | | Remove AssociationReflection#create_association and ↵Jon Leighton2011-06-301-17/+0
| | | | | | | | | | | | | | | | AssociationReflection#create_association! - they are not called from anywhere.
* | | | Assign the association attributes to the associated record before the ↵Jon Leighton2011-06-308-12/+45
| | | | | | | | | | | | | | | | before_initialize callback of the record runs. Fixes #1842.
* | | | match method signature of the superclassAaron Patterson2011-06-302-4/+4
| | | |
* | | | call super rather than delegating to the other objects equal? methodAaron Patterson2011-06-301-1/+1
| | | |
* | | | just alias eql? to == for frewer method callsAaron Patterson2011-06-301-5/+1
| | | |