aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-223-202/+35
| | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request.
* Fix the buildSantiago Pastorino2012-05-221-1/+0
|
* require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
|
* Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-222-10/+61
|\ | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes.
| * Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-222-10/+61
| | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043.
* | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback.
* | Remove not used variables from connection poll testCarlos Antonio da Silva2012-05-211-2/+2
| | | | | | | | These variables were issuing some "not used" warnings.
* | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-212-5/+3
| | | | | | | | Only constantize class_name once.
* | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-213-35/+202
|\ \ | | | | | | Make connection pool fair with respect to waiting threads.
| * | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-203-35/+202
| | |
* | | Merge pull request #6143 from senny/composed_of_converter_returns_nilAaron Patterson2012-05-213-7/+31
|\ \ \ | |/ / |/| | allow the :converter Proc form composed_of to return nil
| * | allow the :converter Proc form composed_of to return nilYves Senn2012-05-033-7/+31
| | | | | | | | | | | | | | | | | | | | | This makes it possible to filter invalid input values before they are passed into the value-object (like empty strings). This behaviour is only relevant if the :allow_nil options is set to true. Otherwise you will get the resulting NoMethodError.
* | | fixed typo in word finidingIvan Kukobko2012-05-201-1/+1
| | |
* | | 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-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds
| * | | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-192-2/+2
| | | | | |
* | | | | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
| | | | | |
* | | | | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
| | | | | |
* | | | | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-185-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | Bug #6289
* | | | | | port some mocha to minitest/mockAaron Patterson2012-05-183-222/+222
| |_|_|_|/ |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 11:25:37 +0000