From bd1af6288449f5abcd38c7076d45793488bc58da Mon Sep 17 00:00:00 2001 From: Andy Pfister Date: Tue, 17 Dec 2024 13:36:43 +0100 Subject: [PATCH 1/2] Remove workaround for "false" return value --- activerecord-sqlserver-adapter.gemspec | 2 +- .../connection_adapters/sqlserver/database_statements.rb | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index 118af47c1..11b377608 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -28,5 +28,5 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "activerecord", "~> 8.1.0.alpha" - spec.add_dependency "tiny_tds" + spec.add_dependency "tiny_tds", "~> 3" end diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index fe286a268..8c99de570 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -461,13 +461,8 @@ def finish_statement_handle(handle) handle end - # TinyTDS returns false instead of raising an exception if connection fails. - # Getting around this by raising an exception ourselves while PR - # https://github.com/rails-sqlserver/tiny_tds/pull/469 is not released. def internal_raw_execute(sql, raw_connection, perform_do: false) result = raw_connection.execute(sql) - raise TinyTds::Error, "failed to execute statement" if result.is_a?(FalseClass) - perform_do ? result.do : result end end From 3c7ad0ab3a18f276cfc00b0ec093e3eb15d38c15 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Wed, 18 Dec 2024 13:52:31 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69928efed..856e2a85b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ ## Unreleased +#### Changed + +- [#1273](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1273) TinyTDS v3+ is now required. + Please check [8-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/8-0-stable/CHANGELOG.md) for previous changes.