aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-05-191-3/+7
|\ | | | | Fix a problem of translate_exception method in a Japanese (non English) environment.
| * Fix a problem of translate_exception method in Japanese.kennyj2012-05-201-3/+7
| |
* | Synchronize read and modification of @reserved_connections hash to avoid ↵Patrick Mahoney2012-05-191-4/+8
|/ | | | concurrency error.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-194-23/+305
|\
| * copy edits [ci skip]Vijay Dev2012-05-191-17/+20
| |
| * add CollectionProxy#last documentationFrancesco Rodriguez2012-05-191-0/+27
| |
| * add CollectionProxy#first documentationFrancesco Rodriguez2012-05-191-0/+27
| |
| * Revert "You can add a custom primary key to a table"Vijay Dev2012-05-191-5/+0
| | | | | | | | | | | | This reverts commit 23a98ffbd9b39ee70094ded1671cf1879d0d3591. [ci skip]
| * improve CollectionProxy#concat documentationFrancesco Rodriguez2012-05-191-7/+18
| |
| * fix CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-1/+1
| |
| * add CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-0/+20
| |
| * add CollectionProxy#clear documentationFrancesco Rodriguez2012-05-191-0/+26
| |
| * add CollectionProxy#include? documentationFrancesco Rodriguez2012-05-181-0/+13
| |
| * You can add a custom primary key to a tableAvi Tzurel2012-05-191-0/+5
| |
| * move docs from CollectionAssociation to CollectionProxyFrancesco Rodriguez2012-05-182-114/+143
| |
| * add explanation of raising errors when a limit scope is supplied in ↵Francesco Rodriguez2012-05-181-11/+11
| | | | | | | | Relation#delete_all
| * Fix typo.Peter Suschlik2012-05-181-1/+1
| |
| * remove incorrect example of CollectionAssociation#empty?Francesco Rodriguez2012-05-181-17/+0
| |
| * add docs to CollectionAssociation#empty?Francesco Rodriguez2012-05-181-3/+32
| |
| * add docs to CollectionAssociation#any?Francesco Rodriguez2012-05-181-0/+30
| |
| * add examples to CollectionAssociation#concatFrancesco Rodriguez2012-05-181-3/+14
| |
| * fix CollectionAssociation docsFrancesco Rodriguez2012-05-171-1/+1
| |
| * add example to CollectionAssociation#destroy_allFrancesco Rodriguez2012-05-171-3/+14
| |
| * add more explanation to CollectionAssociation docsFrancesco Rodriguez2012-05-171-0/+4
| |
| * add CollectionAssociation hierarchyFrancesco Rodriguez2012-05-171-2/+7
| |
| * add docs to CollectionAssociation#many?Francesco Rodriguez2012-05-171-1/+34
| |
| * fix CollectionAssociation#replace docsFrancesco Rodriguez2012-05-171-3/+3
| |
| * Add docs to CollectionAssociation#replaceFrancesco Rodriguez2012-05-171-3/+23
| |
* | Merge pull request #4835 from ↵Carlos Antonio da Silva2012-05-191-3/+3
|\ \ | | | | | | | | | | | | pacoguzman/refactor_define_restrict_dependency_method Refactor define_restrict_dependency_method using reflection
| * | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
| | |
* | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-181-1/+1
|\ \ \ | | | | | | | | Increase numeric-timestamp precision to nanoseconds
| * | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-191-1/+1
| | | |
* | | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-181-0/+1
| | | |
* | | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
| | | |
* | | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-184-10/+35
| | | | | | | | | | | | | | | | Bug #6289
* | | | Merge pull request #6382 from oscardelben/refactor_migration_generatorJosé Valim2012-05-181-6/+3
|\ \ \ \ | |/ / / |/| | | Refactor migration generator
| * | | Refactor migration generatorOscar Del Ben2012-05-181-6/+3
| | | |
* | | | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-171-8/+19
|\ \ \ \ | | | | | | | | | | Postgresql doesn't accept limits on binary (bytea) columns.
| * | | | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-091-8/+19
| | | | |
* | | | | Don't destroy readonly modelsJohannes Barre2012-05-171-0/+1
| | | | |
* | | | | Merge pull request #6058 from ↵Jon Leighton2012-05-172-6/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects
| * | | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-172-6/+31
| | | | | | | | | | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-173-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | | | Revert "Update docs in sqlite3 adapter"Vijay Dev2012-05-171-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e. Reason: Lot of the additions aren't adding value. [ci skip]
| * | | | | Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]Mark Rushakoff2012-05-161-3/+1
| | | | | |
| * | | | | Update AR has_one association exampleAlexey Vakhov2012-05-161-1/+1
| | | | | |
| * | | | | Update docs in sqlite3 adapterOscar Del Ben2012-05-151-12/+12
| | | | | |
| * | | | | Merge pull request #99 from GRoguelon/masterVijay Dev2012-05-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix an error in methods example of instanciated fixtures.
| | * | | | | Fix an error in example in methods of instanciated fixtures.Geoffrey Roguelon2012-05-151-1/+1
| | | | | | |