Skip to content

Commit 23dd9a5

Browse files
committed
correctly retrieve the SQL Server database version
1 parent e984b96 commit 23dd9a5

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## v7.1.11
1+
## Unreleased
2+
3+
#### Fixed
4+
5+
Correctly retrieve the SQL Server database version.
26

37
#### Fixed
48

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ def version_year
505505
end
506506

507507
def sqlserver_version
508-
@sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection).first.first.to_s
508+
@sqlserver_version ||= execute("SELECT @@version", "SCHEMA").rows.first.first.to_s
509509
end
510510

511511
private

test/cases/adapter_test_sqlserver.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
129129
end
130130
end
131131

132+
it 'test proper connection before fetching sqlserver_version'
133+
connection.disconnect!
134+
135+
assert_nothing_raised do
136+
version = connection.sqlserver_version
137+
assert version.is_a?(String)
138+
assert version.length > 0
139+
end
140+
end
141+
132142
describe "with different language" do
133143
before do
134144
@default_language = connection.user_options_language

0 commit comments

Comments
 (0)