File tree Expand file tree Collapse file tree 3 files changed +20
-6
lines changed
lib/active_record/connection_adapters Expand file tree Collapse file tree 3 files changed +20
-6
lines changed Original file line number Diff line number Diff line change 1+ ## Unreleased
2+
3+ #### Fixed
4+
5+ - [ #1363 ] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1363 ) Verify connection before retrieving the database version.
6+
17## v7.1.11
28
39#### Fixed
Original file line number Diff line number Diff line change @@ -493,19 +493,19 @@ def initialize_dateformatter
493493 end
494494
495495 def version_year
496- @version_year ||= begin
497- if sqlserver_version =~ /vNext/
496+ @version_year ||=
497+ if /vNext/ . match? ( sqlserver_version )
498498 2016
499499 else
500500 /SQL Server (\d +)/ . match ( sqlserver_version ) . to_a . last . to_s . to_i
501501 end
502- rescue StandardError
503- 2016
504- end
505502 end
506503
507504 def sqlserver_version
508- @sqlserver_version ||= _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
505+ @sqlserver_version ||= begin
506+ verify!
507+ _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
508+ end
509509 end
510510
511511 private
Original file line number Diff line number Diff line change 1414require "support/connection_reflection"
1515require "mocha/minitest"
1616
17+ Minitest . after_run do
18+ puts "\n \n "
19+ puts "=" * 80
20+ puts ActiveRecord ::Base . connection . send ( :sqlserver_version )
21+ puts "\n SQL Server Version Year: #{ ActiveRecord ::Base . connection . get_database_version } "
22+ puts "=" * 80
23+ end
24+
1725module ActiveRecord
1826 class TestCase < ActiveSupport ::TestCase
1927 SQLServer = ActiveRecord ::ConnectionAdapters ::SQLServer
You can’t perform that action at this time.
0 commit comments