From e24ec67be14d8093cc5566f993429101f2a892d4 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Thu, 26 Mar 2020 16:11:13 +0000 Subject: [PATCH 1/2] Fix method signature --- lib/active_record/connection_adapters/sqlserver_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb index 11c53871c..c5a7aeb12 100644 --- a/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -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) From 7a1552d5aa41ed64bdac0380c582177ffd6355c1 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Thu, 26 Mar 2020 16:11:20 +0000 Subject: [PATCH 2/2] Updated comment --- .../connection_adapters/sqlserver/core_ext/query_methods.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb b/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb index b9f4529dd..91d17721f 100644 --- a/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb +++ b/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb @@ -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))