activerecord-sqlserver-adapter 8.0.8 → 8.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10e87da3715b8059e900f1ecf18af7cd8b0a03ce48b2bd7e79399c4dacba6cfb
-  data.tar.gz: fb175a99c32dcfc1ad7fac35ab53086b97bf75a5e6f6d113ba031a20d4b38ede
+  metadata.gz: 751a7342bce3b73b0a34f0a28a4d534fdfe546802dadc5705248af88027284af
+  data.tar.gz: 924a275891a2097967a8c08b6621084891747fa697dc966cfe782720af08dfa0
 SHA512:
-  metadata.gz: e8319785b8064c84b42848ada06ddcd67e3318b6566f44c6339ad5037a18c5e409ed88d23d11f995220c1ccc34d8aff7af8b95b2c50235e36e279577de801323
-  data.tar.gz: c33591032fc453c2dad5b2acfd0aa83f5e13816291b0c5a867df1eb192c41b9f73e143c1347702b24e99e792c8c060f225958e78e9c6b032ba239277323da93a
+  metadata.gz: ab4f95b51a6cf2479ffe9df506b588232b1f7206c435bd79c12e8f0b144f33daeec56a8ed92f22d5be3e39468360339a1a80b05f006371fc361d00091a54f779
+  data.tar.gz: d4cbe509ec55ed661c7ba1abeed3e926800b2ef4d5fbc134fd033c1c5a96e85fefbb4a26f94eda91b58969878d89d1e1813607b6fa6c63496ae6baa6500cd51b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v8.0.9
+
+#### Fixed
+
+- [#1366](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1366) Correctly retrieve the SQL Server database version.
+
 ## v8.0.8
 
 #### Changed

data/VERSION

@@ -1 +1 @@
-8.0.8
+8.0.9

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -481,19 +481,16 @@ module ActiveRecord
       end
 
       def version_year
-        @version_year ||= begin
-          if sqlserver_version =~ /vNext/
+        @version_year ||=
+          if /vNext/.match?(sqlserver_version)
             2016
           else
             /SQL Server (\d+)/.match(sqlserver_version).to_a.last.to_s.to_i
           end
-        rescue StandardError
-          2016
-        end
       end
 
       def sqlserver_version
-        @sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection).first.first.to_s
+        @sqlserver_version ||= execute("SELECT @@version", "SCHEMA").rows.first.first.to_s
       end
 
       private

data/test/cases/helper_sqlserver.rb

@@ -15,6 +15,14 @@ require "support/connection_reflection"
 require "support/query_assertions"
 require "mocha/minitest"
 
+Minitest.after_run do
+  puts "\n\n"
+  puts "=" * 80
+  puts ActiveRecord::Base.lease_connection.send(:sqlserver_version)
+  puts "\nSQL Server Version Year: #{ActiveRecord::Base.lease_connection.get_database_version}"
+  puts "=" * 80
+end
+
 module ActiveSupport
   class TestCase < ::Minitest::Test
     include ARTest::SQLServer::CoerceableTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.8
+  version: 8.0.9
 platform: ruby
 authors:
 - Ken Collins
@@ -243,8 +243,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.8/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.8
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.9/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.9
 rdoc_options: []
 require_paths:
 - lib