Skip to content

Rails 6: Fix for translate_exception method signature #748

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

Merged
merged 2 commits into from
Mar 30, 2020
Merged

Rails 6: Fix for translate_exception method signature #748

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
e24ec67
Fix method signature
aidanharan Mar 26, 2020
7a1552d
Updated comment
aidanharan Mar 26, 2020
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
3 changes: 2 additions & 1 deletion lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module QueryMethods

private

# Copy of original from Rails master. This patch can be removed when adapter supports Rails 6.
# Copy of original from Rails master.
# This patch can be removed when adapter supports Rails version greater than 6.0.2.2
def table_name_matches?(from)
table_name = Regexp.escape(table.name)
quoted_table_name = Regexp.escape(connection.quote_table_name(table.name))
Expand Down
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def initialize_type_map(m = type_map)
m.register_type 'timestamp', SQLServer::Type::Timestamp.new
end

def translate_exception(e, message)
def translate_exception(e, message:, sql:, binds:)
case message
when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
RecordNotUnique.new(message)
Expand Down