aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5976 from aderyabin/fix1Jeremy Kemper2012-04-251-5/+0
|\
| * 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.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
|/
* 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 valu...Rodrigo Flores2012-04-121-5/+2
| * Added documentation to explain what happens if you don't set any values for t...Rodrigo Flores2012-04-121-2/+5
| * 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 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 use...Reg Braithwaite2012-04-121-2/+2
* | Documents that ActiveRecord's find by id uses to_i to coerce its arguments to...Reg Braithwaite2012-04-121-1/+3
* | Add bang versions of relation query methods.Jon Leighton2012-04-121-84/+135
|/
* Some refactor for association.kennyj2012-04-123-8/+7
* 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.kennyj2012-04-041-1/+1
* | Override AR::Relation methods in NullRelation.Juanjo Bazán2012-04-111-0/+53
* | Corrected grammatical errors in schema_dumper and scoping/defaultdcurtis2012-04-102-2/+2
* | Fix delete_all when chained with joins.Rafael Mendonça França2012-04-103-16/+40
* | Merge pull request #5718 from benedikt/masterJeremy Kemper2012-04-082-6/+5
|\ \
| * | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-032-6/+5
| |/
* | fix markup error [ci skip]Vijay Dev2012-04-081-1/+1
* | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-042-3/+3
|\ \
| * | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-032-3/+3
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-041-3/+3
|\ \
| * | Remove unnecessary articles.Waseem Ahmad2012-04-031-3/+3
| |/
* | DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
* | use File.binread to pull in the schema cacheAaron Patterson2012-04-031-1/+1
|/
* Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-301-2/+3