Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge pull request #2151 from yahonda/fix2139 #2160

Merged
merged 2 commits into from
Mar 31, 2021
Merged

Merge pull request #2151 from yahonda/fix2139 #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb9388
Merge pull request #2151 from yahonda/fix2139
yahonda Mar 31, 2021
f1f4471
Address RuboCop offenses
yahonda Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ def new_connection(config)
@raw_connection = @raw_connection.underlying_connection
end

# Workaround FrozenError (can't modify frozen Hash):
config = config.dup
config[:driver] ||= @raw_connection.meta_data.connection.java_class.name
username = @raw_connection.meta_data.user_name
else
Expand Down
13 changes: 5 additions & 8 deletions lib/active_record/connection_adapters/oracle_enhanced/quoting.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@ module Quoting

def quote_column_name(name) #:nodoc:
name = name.to_s
self.class.quoted_column_names[name] ||= begin
# if only valid lowercase column characters in name
if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
"\"#{name.upcase}\""
else
# remove double quotes which cannot be used inside quoted identifier
"\"#{name.gsub('"', '')}\""
end
self.class.quoted_column_names[name] ||= if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
"\"#{name.upcase}\""
else
# remove double quotes which cannot be used inside quoted identifier
"\"#{name.gsub('"', '')}\""
end
end

Expand Down