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+ - [ #1366 ] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1366 ) Verify connection before retrieving the database version.
6+
17## v8.0.8
28
39#### Changed
Original file line number Diff line number Diff line change @@ -481,15 +481,12 @@ def initialize_dateformatter
481481 end
482482
483483 def version_year
484- @version_year ||= begin
485- if sqlserver_version =~ /vNext/
484+ @version_year ||=
485+ if /vNext/ . match? ( sqlserver_version )
486486 2016
487487 else
488488 /SQL Server (\d +)/ . match ( sqlserver_version ) . to_a . last . to_s . to_i
489489 end
490- rescue StandardError
491- 2016
492- end
493490 end
494491
495492 def sqlserver_version
@@ -499,7 +496,10 @@ def sqlserver_version
499496 private
500497
501498 def connect
502- @raw_connection = self . class . new_client ( @connection_parameters )
499+ @sqlserver_version ||= begin
500+ verify!
501+ _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
502+ end
503503 end
504504
505505 def configure_connection
Original file line number Diff line number Diff line change 1515require "support/query_assertions"
1616require "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 "\n SQL Server Version Year: #{ ActiveRecord ::Base . lease_connection . get_database_version } "
23+ puts "=" * 80
24+ end
25+
1826module ActiveSupport
1927 class TestCase < ::Minitest ::Test
2028 include ARTest ::SQLServer ::CoerceableTest
You can’t perform that action at this time.
0 commit comments