activerecord-sqlserver-adapter 7.1.11 → 7.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 531fab1f224da7d891c04cedd34bb8c69f476a60b087c028cf6d71fc761d2d72
-  data.tar.gz: 6134232daadb1a20c3e4a7b26c2b2b216c321c838cf8b298f41fed6ae94fba1c
+  metadata.gz: d75e1813f4cc37e96a53086dc3802c0f7335e28858bb7b15c8f2a87e4b58cadb
+  data.tar.gz: a7d8159901b7945221ac08c8f531f6bf818573807507c7a1e8252c0570390c21
 SHA512:
-  metadata.gz: c3c56b8e1943bc68399e9b177f68d5afcf1a5d3dd072003f80f5ab935b71f7853ff1fcfc4139d624162eff9e20a89487cb7f2c810440f174b18ce2eb21d8d604
-  data.tar.gz: 70b1644783875b57886228f373fa57e0243843bee416006e871ff7f9226b3dd1471e35d6b236ba19e86088a9bea6850cd6d502cd1dd76806c1ea66378256d6b9
+  metadata.gz: 52ac116fef2f6b40c321eec6c0eab14dc76e0b885820fcc8c0518e7ec2ef561c27db205434dc57b8a73dd431fe8230541fbc07067e4514675b5dd9e4c44ff9b4
+  data.tar.gz: 4a78c58615b2e94f71c9a5904230d0f8418549cb9013fd39182e40d15439d148615c46dfcf11905c8a5d2e51f7730e5852fa4ed152bcddd08d5069c2ec1da135

data/.github/workflows/ci.yml

@@ -5,7 +5,8 @@ on: [push, pull_request]
 jobs:
   test:
     name: Run test suite
-    runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     env:
       COMPOSE_FILE: docker-compose.ci.yml

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v7.1.12
+
+#### Fixed
+
+- [#1363](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1363) Verify connection before retrieving the database version.
+
 ## v7.1.11
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-7.1.11
+7.1.12

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -493,19 +493,19 @@ 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 ||= begin
+          verify!
+          _raw_select("SELECT @@version", @raw_connection).first.first.to_s
+        end
       end
 
       private

data/test/cases/helper_sqlserver.rb

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

data/test/cases/rake_test_sqlserver.rb

@@ -138,18 +138,22 @@ class SQLServerRakeStructureDumpLoadTest < SQLServerRakeTest
 
   it "dumps structure and accounts for defncopy oddities" do
     skip "debug defncopy on windows later" if host_windows?
+
     quietly { db_tasks.structure_dump configuration, filename }
+
     _(filedata).wont_match %r{\AUSE.*\z}
     _(filedata).wont_match %r{\AGO.*\z}
-    _(filedata).must_match %r{email\s+nvarchar\(4000\)}
-    _(filedata).must_match %r{background1\s+nvarchar\(max\)}
-    _(filedata).must_match %r{background2\s+text\s+}
+    _(filedata).must_match %r{\[?email\]?\s+nvarchar\(4000\)}
+    _(filedata).must_match %r{\[?background1\]?\s+nvarchar\(max\)}
+    _(filedata).must_match %r{\[?background2\]?\s+text\s+}
   end
 
   it "can load dumped structure" do
     skip "debug defncopy on windows later" if host_windows?
+
     quietly { db_tasks.structure_dump configuration, filename }
-    _(filedata).must_match %r{CREATE TABLE dbo\.users}
+
+    _(filedata).must_match %r{CREATE TABLE \[?dbo\]?\.\[?users\]?}
     db_tasks.purge(configuration)
     _(connection.tables).wont_include "users"
     db_tasks.load_schema db_config, :sql, filename

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.1.11
+  version: 7.1.12
 platform: ruby
 authors:
 - Ken Collins
@@ -12,10 +12,9 @@ authors:
 - Joe Rafaniello
 - Tom Ward
 - Aidan Haran
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -240,9 +239,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/v7.1.11/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.11
-post_install_message:
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.1.12/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.12
 rdoc_options: []
 require_paths:
 - lib
@@ -257,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files: