Skip to content
Merged
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Unreleased

#### Fixed

- [#1363](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1363) Verify connection before retrieving the database version.

## v7.1.11

#### Fixed
Expand Down
12 changes: 6 additions & 6 deletions lib/active_record/connection_adapters/sqlserver_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -493,19 +493,19 @@ def initialize_dateformatter
end

def version_year
@version_year ||= begin
if sqlserver_version =~ /vNext/
@version_year ||=
if /vNext/.match?(sqlserver_version)
2016
else
/SQL Server (\d+)/.match(sqlserver_version).to_a.last.to_s.to_i
end
rescue StandardError
2016
end
end

def sqlserver_version
@sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection).first.first.to_s
@sqlserver_version ||= begin
verify!
_raw_select("SELECT @@version", @raw_connection).first.first.to_s
end
end

private
Expand Down
8 changes: 8 additions & 0 deletions test/cases/helper_sqlserver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
require "support/connection_reflection"
require "mocha/minitest"

Minitest.after_run do
puts "\n\n"
puts "=" * 80
puts ActiveRecord::Base.connection.send(:sqlserver_version)
puts "\nSQL Server Version Year: #{ActiveRecord::Base.connection.get_database_version}"
puts "=" * 80
end

module ActiveRecord
class TestCase < ActiveSupport::TestCase
SQLServer = ActiveRecord::ConnectionAdapters::SQLServer
Expand Down