aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0514-19/+57
|\
| * Raise error on unknown primary key.Jon Leighton2011-10-0512-18/+54
| * Changing rake db:schema:dump to run :environment as well as :load_config, as ...Ben Woosley2011-10-041-1/+1
| * To support ActiveRecord unit tests for IBM DB2Yasuo Honda2011-10-021-0/+2
* | Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0116-29/+140
|\|
| * Add CHANGELOG entriesSantiago Pastorino2011-09-291-1/+25
| * Don't call self.class unless necessary. Closes #3171.Jon Leighton2011-09-292-2/+3
| * Fixed failed test under 1.8.7 as map.keys order in indeterminableRocky Jaiswal2011-09-282-2/+2
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-281-1/+1
| |\
| | * fixing docs for delete_sql where quotes should be used in this example.Diego Plentz2011-09-261-1/+1
| * | Don't require a DB connection when setting primary key.Jon Leighton2011-09-263-1/+20
| * | Merge pull request #3030 from htanata/fix_habtm_select_query_methodJon Leighton2011-09-263-4/+16
| * | Fix belongs_to polymorphic with custom primary key on target.Jon Leighton2011-09-265-18/+30
| * | CollectionProxy#replace should change the DB records rather than just mutatin...Jon Leighton2011-09-262-1/+12
| |/
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-211-0/+29
| |\
| | * copy edits 908f2616Vijay Dev2011-09-201-4/+4
| | * Document ActiveRecord::QueryMethods#selectRyan Bigg2011-09-171-0/+29
| * | fix test error when running with postgresql.Arun Agrawal2011-09-181-2/+4
| * | to_xml should also rely on serializable hash.José Valim2011-09-181-1/+1
| * | Fixed test for JRuby. Arun Agrawal2011-09-181-1/+2
| |/
* | Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-09-1522-123/+212
|\|
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-152-1/+37
| |\
| | * minor editVijay Dev2011-09-141-1/+1
| | * Add documentation for the extending method in ActiveRecord:QueryMethodsRyan Bigg2011-09-141-0/+36
| | * [:class_name] option in belongs_to should mention belongs_to and not has_oneErik Behrends2011-09-131-1/+1
| * | update 3.1 release date in changelogsVijay Dev2011-09-141-1/+1
| * | Stop trying to be clever about when to define attribute methods.Jon Leighton2011-09-142-34/+1
| * | We don't need to build a set for DangerousAttributeError.Jon Leighton2011-09-141-7/+13
| * | Rename first_or_new to first_or_initialize.Jon Leighton2011-09-135-28/+15
| |/
| * Deprecate using method_missing for attributes that are columns.Jon Leighton2011-09-132-0/+30
| * Let Ruby deal with method visibility.Jon Leighton2011-09-132-10/+13
| * Reset column info when messing with columns.Jon Leighton2011-09-131-0/+2
| * Always generate attribute methods on the base class.Jon Leighton2011-09-134-6/+36
| * Raise error when using write_attribute with a non-existent attribute.Jon Leighton2011-09-138-25/+47
| * Make protected method public so we avoid method_missing.Jon Leighton2011-09-131-4/+5
| * Fix warnings.Jon Leighton2011-09-131-1/+1
| * Add deprecation for doing `attribute_method_suffix ''`Jon Leighton2011-09-131-2/+0
| * Alias id= if necessary, rather than relying on method_missingJon Leighton2011-09-131-0/+4
| * Merge pull request #2936 from joelmoss/migration_statusSantiago Pastorino2011-09-111-5/+7
| * Not used variables removed. Warnings removed.Arun Agrawal2011-09-101-1/+1
| * Add missing require in base_test.rb, fixes isolated testGuillermo Iguaran2011-09-091-0/+1
* | Test polymorphic record with optimistic locking and counter cache should be d...Dmitry Polushkin2011-09-093-1/+14
|/
* Merge pull request #2757 from andmej/first_or_create_pull_requestJon Leighton2011-09-085-0/+209
|\
| * Using more precise method signatures for AR::Relation#first_or_create family ...Andrés Mejía2011-09-061-6/+6
| * Adding first example with no arguments to AR::Relation#first_or_create and re...Andrés Mejía2011-09-061-15/+15
| * Adding first_or_create, first_or_create!, first_or_new and first_or_build to ...Andrés Mejía2011-08-305-0/+209
* | LRU cache in mysql and sqlite are now per-process caches.Aaron Patterson2011-09-075-22/+82
* | fixing file nameAaron Patterson2011-09-071-0/+0
* | LRU should cache per process in postgresql. fixes #1339Aaron Patterson2011-09-072-10/+37
* | fixing view queriesAaron Patterson2011-09-071-3/+5