Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def finish_statement_handle(handle)
end

def ensure_established_connection!
raise TinyTds::Error, 'SQL Server client is not connected' if @connection.nil? || [email protected]?
raise TinyTds::Error, 'SQL Server client is not connected' unless @connection

yield
end
Expand Down
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def initialize_type_map(m = type_map)

def translate_exception(e, message:, sql:, binds:)
case message
when /SQL Server client is not connected/
when /(SQL Server client is not connected) | (failed to execute statement)/i
ConnectionNotEstablished.new(message)
when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
RecordNotUnique.new(message, sql: sql, binds: binds)
Expand Down