Remove obsolete activerecord patch #1611
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[#46224565] The following rake tasks are added and work similar to how they work in rails apps: * db:create * db:drop * db:migrate * db:migrate:status * db:rollback * db:schema:dump * db:schema:load * db:seed (but no db seeds defined at this time) * db:setup * db:version The hidden task db:test:prepare is also available, which means `rake spec` can depend on it so that the test database is dropped and recreated from the development database when running specs (Although there are yet to be database tests, this branch is in preparation for that work that will be split between multiple developers.)
[#46141013] Spec the desired behavior for ConnectionPool prior to removing the patch to sync with upstream 3.2.12.
[#46141013] Version 3.2.12 of activerecord contains the changes that the original patch made so the patch is no longer needed.
|
Pivotal Story: https://www.pivotaltracker.com/story/show/46141013 |
|
This pull request is a superset of #1592 so if this pull request is accepted, then 1592 will be closed automatically. |
|
Verification Steps: Because this pull request is a superset of #1592, please complete its Verification Step before proceeding to the below steps.
|
|
Looks good -- especially love the part where you re-implemented the connection pool test as a rake spec to prove that the patch is no longer needed. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The original activerecord patch is no longer needed because the additional functionality it added to 3.2.2 is included in 3.2.12.
3.2.2 only checked if any connection was in use (https://github.com/rails/rails/blob/v3.2.2/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb#L100), but 3.2.12
(https://github.com/rails/rails/blob/v3.2.12/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb#L107) checks if the current Thread's connection is in use, which matches behavior added by
active_thread_connection?(https://github.com/rapid7/metasploit-framework/blob/master/lib/msf/core/patches/active_record.rb#L12) in the patch.3.2.2 only used
@queue.waitto check for connection timeouts (https://github.com/rails/rails/blob/v3.2.2/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb#L252), but 3.2.12 (https://github.com/rails/rails/blob/v3.2.2/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb#L252) usesTime.nowsimilar to how the patch did (https://github.com/rapid7/metasploit-framework/blob/master/lib/msf/core/patches/active_record.rb#L76)