Merge pull request #748 from aidanharan/fix-rake-test

Rails 6: Fix for translate_exception method signature

Author: wpolicarpo

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))

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)