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
+ - [ #1364 ] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1364 ) Verify connection before retrieving the database version.
6
+
1
7
## v7.2.7
2
8
3
9
#### Changed
Original file line number Diff line number Diff line change @@ -490,19 +490,19 @@ def initialize_dateformatter
490
490
end
491
491
492
492
def version_year
493
- @version_year ||= begin
494
- if sqlserver_version =~ /vNext/
493
+ @version_year ||=
494
+ if /vNext/ . match? ( sqlserver_version )
495
495
2016
496
496
else
497
497
/SQL Server (\d +)/ . match ( sqlserver_version ) . to_a . last . to_s . to_i
498
498
end
499
- rescue StandardError
500
- 2016
501
- end
502
499
end
503
500
504
501
def sqlserver_version
505
- @sqlserver_version ||= _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
502
+ @sqlserver_version ||= begin
503
+ verify!
504
+ _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
505
+ end
506
506
end
507
507
508
508
private
Original file line number Diff line number Diff line change 15
15
require "support/query_assertions"
16
16
require "mocha/minitest"
17
17
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
+
18
26
module ActiveSupport
19
27
class TestCase < ::Minitest ::Test
20
28
include ARTest ::SQLServer ::CoerceableTest
You can’t perform that action at this time.
0 commit comments