Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
## Unreleased

#### Fixed

- [#1362](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1362) Correctly retrieve the SQL Server database version.

## v8.0.8

#### Changed

- [#1342](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1342) Support more Azure services by changing language source.

#### Fixed

- [#1345](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1345) Maintain index options during `change_column` operations.
- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.

Expand Down
9 changes: 3 additions & 6 deletions lib/active_record/connection_adapters/sqlserver_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -481,19 +481,16 @@ def initialize_dateformatter
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
Expand Down
10 changes: 10 additions & 0 deletions test/cases/adapter_test_sqlserver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,16 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
end
end

it 'valid connection before fetching SQL Server version' do
connection.disconnect!

assert_nothing_raised do
version = connection.sqlserver_version
assert version.is_a?(String)
assert version.length > 0
end
end

describe "with different language" do
before do
@default_language = connection.user_options_language
Expand Down
8 changes: 8 additions & 0 deletions test/cases/helper_sqlserver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
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
Expand Down
Loading