Skip to content

Commit e5fc2d6

Browse files
committed
Correctly parse the database version
1 parent 8739eea commit e5fc2d6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Diff for: lib/active_record/connection_adapters/sqlserver_adapter.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,11 @@ def version_year
492492
else
493493
/SQL Server (\d+)/.match(sqlserver_version).to_a.last.to_s.to_i
494494
end
495-
rescue
496-
2016
497495
end
498496
end
499497

500498
def sqlserver_version
501-
@sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection).first.first.to_s
499+
@sqlserver_version ||= execute("SELECT @@VERSION").rows.first.first.to_s
502500
end
503501

504502
private

Diff for: test/cases/helper_sqlserver.rb

+8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
require "support/query_assertions"
1616
require "mocha/minitest"
1717

18+
Minitest.after_run do
19+
puts "\n\n"
20+
puts "=" * 80
21+
puts ActiveRecord::Base.lease_connection.send(:sqlserver_version)
22+
puts "\nSQL Server Version Year: #{ActiveRecord::Base.lease_connection.get_database_version}"
23+
puts "=" * 80
24+
end
25+
1826
module ActiveSupport
1927
class TestCase < ::Minitest::Test
2028
include ARTest::SQLServer::CoerceableTest

0 commit comments

Comments
 (0)