aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \ \ \ \ \
| * | | | | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if they are not defined or delegated. In this way, we have a performance boost invoking some array methods which are not defined in CollectionAssociation.
* | | | | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-254-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb
| * | | | | | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-131-1/+2
| | | | | | | |
| * | | | | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
| | | | | | | |
* | | | | | | | extract #with_scope and #with_exclusive_scope to ↵Jon Leighton2012-04-252-122/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active_record_deprecated_finders
* | | | | | | | extract deprecated codeJon Leighton2012-04-251-4/+2
| | | | | | | |
* | | | | | | | Extract deprecated codeJon Leighton2012-04-251-9/+8
| | | | | | | |
* | | | | | | | fix interpolation for hash mergingJon Leighton2012-04-252-20/+26
| | | | | | | |
* | | | | | | | allow merging a single where valueJon Leighton2012-04-251-1/+1
| | | | | | | |
* | | | | | | | extract to active_record_deprecated_findersJon Leighton2012-04-251-6/+5
| | | | | | | |
* | | | | | | | giving a hash to default scope should not be deprecated (well, not for this ↵Jon Leighton2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason)
* | | | | | | | Merge pull request #5976 from aderyabin/fix1Jeremy Kemper2012-04-251-5/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Duplicate quote_table_name method
| * | | | | | | | already defined in quotingAndrey Deryabin2012-04-251-5/+0
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | cleanliness in method parametersAndrey Deryabin2012-04-251-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #5887 from mcrowe/document-relation-mergeVijay Dev2012-04-231-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add documentation to the SpawnMethods#merge method.
| * | | | | | | Add documentation to the SpawnMethods#merge method.Mitch Crowe2012-04-171-0/+14
| | | | | | | |
* | | | | | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-191-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | option
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Added documentation to explain what happens if you don't set any ↵Rodrigo Flores2012-04-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461.
| * | | | | | | Added documentation to explain what happens if you don't set any values for ↵Rodrigo Flores2012-04-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dependent option on has_many
| * | | | | | | Fix typo on the add_index.kennyj2012-04-131-1/+1
| |/ / / / / /
* | | | | | | opening a connection will block if the pool is fullAaron Patterson2012-04-151-20/+39
| | | | | | |
* | | | | | | Automatically create indexes for references/belongs_to statements in migrations.Joshua Wood2012-04-143-5/+23
| | | | | | |
* | | | | | | extract deprecated code for #find, #first, #last, #allJon Leighton2012-04-131-105/+36
| | | | | | |
* | | | | | | extract deprecated #calculate codeJon Leighton2012-04-131-83/+25
| | | | | | |
* | | | | | | move code out to active_record_deprecated_findersJon Leighton2012-04-131-7/+2
| | | | | | |
* | | | | | | Merge pull request #5832 from kennyj/fix_5267Jon Leighton2012-04-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method.
| * | | | | | | Fix wrong return value from reset_sequence_name method.kennyj2012-04-141-1/+1
| | | | | | | |
* | | | | | | | move some of the update_all implementation to active_record_deprecated_findersJon Leighton2012-04-131-27/+14
| | | | | | | |
* | | | | | | | now we can just manipulate the values hash in #only and #exceptJon Leighton2012-04-133-36/+13
| | | | | | | |
* | | | | | | | use a hash to store relation valuesJon Leighton2012-04-134-45/+67
|/ / / / / / /
* | | | | | | doesn't make sense for select! to take a blockJon Leighton2012-04-131-8/+3
| | | | | | |
* | | | | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-133-9/+10
| | | | | | |
* | | | | | | Make Relation#extending work like other value methodsJon Leighton2012-04-134-19/+13
| | | | | | |
* | | | | | | Add Relation#merge!Jon Leighton2012-04-131-9/+12
| | | | | | |
* | | | | | | assert valid keysJon Leighton2012-04-132-0/+7
| | | | | | |
* | | | | | | Allow Relation#merge to take a hashJon Leighton2012-04-133-47/+75
| | | | | | |
* | | | | | | we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-133-7/+10
| | | | | | |
* | | | | | | refactoringJon Leighton2012-04-131-36/+45
| | | | | | |
* | | | | | | Extract clusterfuck method for surgeryJon Leighton2012-04-132-71/+92
| | | | | | |
* | | | | | | mention that coercion only happens when the primary key is an integer and ↵Reg Braithwaite2012-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | use +to_i+ formatting
* | | | | | | Documents that ActiveRecord's find by id uses to_i to coerce its arguments ↵Reg Braithwaite2012-04-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to integers
* | | | | | | Add bang versions of relation query methods.Jon Leighton2012-04-121-84/+135
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The main reason for this is that I want to separate the code that does the mutating from the code that does the cloning.
* | | | | | Some refactor for association.kennyj2012-04-123-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused association_class method. * Remove a unnecessary assignment. * Move @updated to BelongsToAssociation that only reference this instance variable. * Reset @stale_state at the reset method. I think this place is right place.
* | | | | | move apply_finder_options to active_record_deprecated_findersJon Leighton2012-04-121-22/+0
| | | | | |
* | | | | | add active_record_deprecated_finders as a depJon Leighton2012-04-121-0/+1
| | | | | |
* | | | | | Merge pull request #5720 from kennyj/should_use_klass_methodJon Leighton2012-04-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Get a properly aliased_table_name, when we use a polymorphic association.
| * | | | | | Get a properly aliased_table_name, when we use a polymorphic association.kennyj2012-04-041-1/+1
| | |/ / / / | |/| | | |
* | | | | | Override AR::Relation methods in NullRelation.Juanjo Bazán2012-04-111-0/+53
| | | | | | | | | | | | | | | | | | So a NullRelation (Relation#none) is chainable with database methods.