activerecord-sqlserver-adapter 8.1.1 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b25d2f113659a1d5ed3735d035e9eb5781a8b84bde9444cf6ac2cbd4b8692dd
-  data.tar.gz: ccef97cedd3a0d98832f67773c9c5a81047155af1c81e940938eb59ce17ed618
+  metadata.gz: b233f0d16ac6cda7cd510614f1c9262f7362fa9a19ccdfc20664c36bcee6852a
+  data.tar.gz: 9929d4e6e483b4594969333727fdfabacf379bd59b57f9a336673a1f1a04a057
 SHA512:
-  metadata.gz: a997a0ec9a5b6bd703965236791873c98cdbd267630cf892a6246effad992658eb3da9840430e782180be378af0629a2dbfc3d55e0a12b8602cc31bd6a9781e4
-  data.tar.gz: 79b9d71e963d0f9ef40bb18ce04e0db2ec10c70bcd1a9614968a4828e1e58c9fb133782b4982e23f7d39f4c7d0c86670d14ec87be953e5d800929e5f9cc4200e
+  metadata.gz: 715cf25b356956e018c9ff202583b77c48e50d8946d0eef5b2b4a4dc75d1fea206a2ce5db78109722c6eda000d24cb222d6abd25cf3b630885236d76a83c623b
+  data.tar.gz: 139afbfa982ca4ae21be4458ea3b1666803750810443a754099a01f9479acc83c35bd0aa4ede17e7416cf0702d0417714f02fdeae5da09aebddf873061d4ff77

data/.github/workflows/ci.yml

@@ -1,12 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  schedule:
-    - cron: '0 4 * * 0'
+on: [push, pull_request]
 
 jobs:
   test:

data/CHANGELOG.md

@@ -1,5 +1,24 @@
+## v8.1.3
+
+#### Added
+
+- [#1383](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1383) Support trust_server_certificate option in dbconsole.
+
+#### Changed
+
+- [#1393](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1393) Treat TinyTDS `failed dbsqlsend() function` errors as `ConnectionNotEstablished` so they're retried instead of surfaced as `StatementInvalid`.
+- [#1397](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1397) Treat "DBPROCESS is dead or not enabled" as ConnectionNotEstablished.
+
+## v8.1.2
+
+#### Fixed
+
+- [#1377](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1377) Fixed SQL Server database tasks.
+
 ## v8.1.1
 
+#### Fixed
+
 - [#1376](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1376) Fixed ActiveRecord gemspec dependency.
 
 ## v8.1.0

data/Gemfile

@@ -9,9 +9,10 @@ gemspec
 gem "bcrypt"
 gem "pg", "1.5.9"
 gem "sqlite3", ">= 2.1"
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data"
 gem "benchmark-ips"
-gem "minitest", ">= 5.15.0"
+gem "minitest", "~> 6.0"
+gem "minitest-mock"
 gem "msgpack", ">= 1.7.0"
 
 if ENV["RAILS_SOURCE"]

data/VERSION

@@ -1 +1 @@
-8.1.1
+8.1.3

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -104,6 +104,7 @@ module ActiveRecord
           args += ["-d", config.database.to_s] if config.database
           args += ["-U", sqlserver_config[:username].to_s] if sqlserver_config[:username]
           args += ["-P", sqlserver_config[:password].to_s] if sqlserver_config[:password]
+          args += ["-C"] if sqlserver_config[:trust_server_certificate]
 
           if sqlserver_config[:host]
             host_arg = "tcp:#{sqlserver_config[:host]}"
@@ -482,7 +483,7 @@ module ActiveRecord
 
       def translate_exception(exception, message:, sql:, binds:)
         case message
-        when /(SQL Server client is not connected)|(failed to execute statement)/i
+        when /(SQL Server client is not connected)|(failed to execute statement)|(failed dbsqlsend)|(DBPROCESS is dead or not enabled)/i
           ConnectionNotEstablished.new(message, connection_pool: @pool)
         when /(cannot insert duplicate key .* with unique index) | (violation of (unique|primary) key constraint)/i
           RecordNotUnique.new(message, sql: sql, binds: binds, connection_pool: @pool)

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -7,7 +7,7 @@ require "socket"
 
 module ActiveRecord
   module Tasks
-    class SQLServerDatabaseTasks
+    class SQLServerDatabaseTasks < AbstractTasks
       DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS"
 
       delegate :with_connection, :establish_connection, to: ActiveRecord::Base

data/test/cases/{dbconsole.rb → dbconsole_test_sqlserver.rb}

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 class DbConsole < ActiveRecord::TestCase
-  subject { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter }
+  subject { ActiveRecord::ConnectionAdapters::SQLServerAdapter }
 
-  it "uses sqlplus to connect to database" do
-    subject.expects(:find_cmd_and_exec).with("sqlcmd", "-d", "db", "-U", "user", "-P", "secret", "-S", "tcp:localhost,1433")
+  it "uses sqlcmd to connect to database" do
+    subject.expects(:find_cmd_and_exec).with("sqlcmd", "-d", "db", "-U", "user", "-P", "secret", "-C", "-S",
+      "tcp:localhost,1433")
 
-    config = make_db_config(adapter: "sqlserver", database: "db", username: "user", password: "secret", host: "localhost", port: 1433)
+    config = make_db_config(adapter: "sqlserver", database: "db", username: "user", password: "secret",
+      host: "localhost", port: 1433, trust_server_certificate: true)
 
     subject.dbconsole(config)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Ken Collins
@@ -154,7 +154,7 @@ files:
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
-- test/cases/dbconsole.rb
+- test/cases/dbconsole_test_sqlserver.rb
 - test/cases/disconnected_test_sqlserver.rb
 - test/cases/eager_load_too_many_ids_test_sqlserver.rb
 - test/cases/enum_test_sqlserver.rb
@@ -245,8 +245,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.1.1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.1.1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.1.3/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.1.3
 rdoc_options: []
 require_paths:
 - lib