Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log name #36202
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
This commit adds "TRANSACTION" to savepoint and commit, rollback statements because none of savepoint statements were removed by rails#36153 since they are not "SCHEMA" statements. Although, only savepoint statements can be labeled as "TRANSACTION" I think all of transaction related method should add this label. Follow up rails#36153
kamipo
reviewed
May 7, 2019
| @@ -107,20 +107,12 @@ def clear_log; self.log = []; self.log_all = []; end | |||
|
|
|||
| clear_log | |||
|
|
|||
| self.ignored_sql = [/^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/] | |||
There was a problem hiding this comment.
I've realized #36153 accidentally removed /^BEGIN/, and /^COMMIT/.
Adding "TRANSACTION" to the /^SAVEPOINT/, /^RELEASE SAVEPOINT/, /^ROLLBACK/, /^BEGIN/, and /^COMMIT/ is fine to me.
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 6, 2019
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 7, 2019
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 18, 2019
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 19, 2019
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 21, 2019
Refer rails/rails#36153 and rails/rails#36202 Some of Oracle enhanced adapter unit tests get failed because they depend on log output which is not logged since they are "SCHEMA". To workaround these failures overriding `ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES` in `spec/spec_helper.rb`, which causes these warnings. ``` $ bundle exec rspec ==> Loading config from ENV or use default ==> Running specs with MRI version 2.6.3 ==> Effective ActiveRecord version 6.1.0.alpha /home/yahonda/git/oracle-enhanced/spec/spec_helper.rb:112: warning: already initialized constant ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES /home/yahonda/git/rails/activerecord/lib/active_record/log_subscriber.rb:5: warning: previous definition of IGNORE_PAYLOAD_NAMES was here ```
yahonda
added a commit
to yahonda/oracle-enhanced
that referenced
this pull request
Jun 21, 2019
Refer rails/rails#36153 and rails/rails#36202 Some of Oracle enhanced adapter unit tests get failed because they depend on log output which is not logged since they are "SCHEMA". To workaround these failures overriding `ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES` in `spec/spec_helper.rb`, which causes these warnings. ``` $ bundle exec rspec ==> Loading config from ENV or use default ==> Running specs with MRI version 2.6.3 ==> Effective ActiveRecord version 6.1.0.alpha /home/yahonda/git/oracle-enhanced/spec/spec_helper.rb:112: warning: already initialized constant ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES /home/yahonda/git/rails/activerecord/lib/active_record/log_subscriber.rb:5: warning: previous definition of IGNORE_PAYLOAD_NAMES was here ```
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.
Summary
Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log name.
This commit adds "TRANSACTION" to savepoint and commit, rollback statements
because none of savepoint statements were removed by #36153 since they are not "SCHEMA" statements.
Although, only savepoint statements can be labeled as "TRANSACTION"
I think all of transaction related method should add this label.
Follow up #36153