Updates to run tests with activerecord 7.1 #2359
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
We can't call @raw_connection right away anymore, because it is nil until it is used after the changes in rails/rails#44576 and rails/rails#44591. Also we need to have @lock established in order to be able to use `with_raw_connection`. In the abstract_adapter implementation, that happens after the arel_visitor is set, but in oracle enhanced, we need to use `with_raw_connection` to check the database version in order to pick with visitor to use. Calling lock_thread = nil before super means @lock isi available to set the arel_visitor. Rails rails/rails#48229 also requires an internal_exec_query method that is called by the abstract adpater's exec_query. Naively renaming the oracle-enhanced's exec_query to internal_exec_query makes the oracle enhanced tests run. I also saw errors due to `active?` using @raw_connection. `valid_raw_connection` ends up calling `active?` via `with_raw_connection` and `verify` so that can't be used as a replacement for @raw_connection here. Borrowing from the postgres adapter implementation to get around this.
|
#2381 is running against rails 7-1-stable with passing tests. |
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.
When running the oracle enhanced tests with activerecord v7.1.0 or above I get:
Line 24 in the rakefile that is causing the problem is
ActiveRecord::Base.connection.execute_structure_dump(ActiveRecord::Base.connection.full_drop). This appears to be related to the changes in rails/rails#44576 and rails/rails#44591. We no longer have a@raw_connectionafter callingActiveRecord::Base.establish_connection(CONNECTION_PARAMS)on line 22, so trying work withActiveRecord::Base.connectiongives us the nil error.3a288c3 addresses the error in starting the tests by:
get_database_versionto usevalid_raw_connectionwhich will connect if necessaryself.lock_thread = nilbefore the call tosuperinOracleEnhancedAdapter#initialize. In super they assign a visitor beforeself.lock_thread = nil. In oracle enhanced assigning a visitor requires a check ofdatabase_version, which with the new use ofvalid_raw_connectionrequires@lockto be set first.After those changes, the test start, although with many errors. A couple of the more immediate ones are addressed here as well:
internal_exec_querythat is called by the abstract adapter'sexec_query. Renaming oracle_enhanced'sexec_querytointernal_exec_queryto address thisactive?because@raw_connectionis nil. Usingvalid_raw_connectioninactive?results in a stack level too deep, so I adapted he postgres adapter's implementation.