Merge pull request #2151 from yahonda/fix2139 #2160
Merged
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
Address `FrozenError (can't modify frozen Hash):` error
The offense itself has been fixed by rsim@d105887 at master branch. `git cherry-pick d105887` conflics then executed `bundle exec rubocop -a` for release61 branch. ``` $ bundle exec rubocop -v 1.12.0 $ bundle exec rubocop -a Inspecting 70 files ...................W.................................................. Offenses: lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:13:52: C: [Corrected] Style/RedundantBegin: Redundant begin block detected. self.class.quoted_column_names[name] ||= begin ^^^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:14:11: C: [Corrected] Layout/IndentationWidth: Use 2 (not 4) spaces for indentation. "\"#{name.upcase}\"" ^^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:15:13: C: [Corrected] Layout/ElseAlignment: Align else with self.class.quoted_column_names[name]. else ^^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:16:15: C: [Corrected] Layout/CommentIndentation: Incorrect indentation detected (column 14 instead of 12). # remove double quotes which cannot be used inside quoted identifier ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:17:11: C: [Corrected] Layout/IndentationWidth: Use 2 (not 4) spaces for indentation. "\"#{name.gsub('"', '')}\"" ^^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:18:13: W: [Corrected] Layout/EndAlignment: end at 18, 12 is not aligned with self.class.quoted_column_names[name] ||= if at 13, 10. end ^^^ lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:19:1: C: [Corrected] Layout/EmptyLinesAroundMethodBody: Extra empty line detected at method body end. lib/active_record/connection_adapters/oracle_enhanced/quoting.rb:19:1: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected. 70 files inspected, 8 offenses detected, 8 offenses corrected Tip: Based on detected gems, the following RuboCop extension libraries might be helpful: * rubocop-rake (https://github.com/rubocop/rubocop-rake) * rubocop-rspec (https://github.com/rubocop/rubocop-rspec) You can opt out of this message by adding the following to your config (see https://docs.rubocop.org/rubocop/extensions.html#extension-suggestions for more options): AllCops: SuggestExtensions: false $ ```
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.
This pull request backports #2151 to release61 branch.