File tree 3 files changed +13
-5
lines changed
lib/active_record/connection_adapters
3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 9
9
10
10
- [ #1273 ] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1273 ) TinyTDS v3+ is now required.
11
11
12
+ #### Fixed
13
+
14
+ - [ #1313 ] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1313 ) Correctly retrieve the SQL Server database version.
12
15
13
16
Please check [ 8-0-stable] ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/8-0-stable/CHANGELOG.md ) for previous changes.
Original file line number Diff line number Diff line change @@ -486,19 +486,16 @@ def initialize_dateformatter
486
486
end
487
487
488
488
def version_year
489
- @version_year ||= begin
489
+ @version_year ||=
490
490
if /vNext/ . match? ( sqlserver_version )
491
491
2016
492
492
else
493
493
/SQL Server (\d +)/ . match ( sqlserver_version ) . to_a . last . to_s . to_i
494
494
end
495
- rescue
496
- 2016
497
- end
498
495
end
499
496
500
497
def sqlserver_version
501
- @sqlserver_version ||= _raw_select ( "SELECT @@version" , @raw_connection ) . first . first . to_s
498
+ @sqlserver_version ||= execute ( "SELECT @@version" , "SCHEMA" ) . rows . first . first . to_s
502
499
end
503
500
504
501
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