activerecord-sqlserver-adapter 8.0.1 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99a1de9708c420caf70ef674f8030ad285cd514110ddac415855918dba0312d
-  data.tar.gz: 54a9fd23dc6c22d61f8c7bedbc369ac727b198068e1c33a5937c6440d426c649
+  metadata.gz: 1b4cb69b0399f82377f0040e7dcccd0719b6c0888340c9b414242c8c34ef397f
+  data.tar.gz: f4471895b0205dd2a0fc64e6c11bff4029f571d7dd32785716f8c25e543ea5d5
 SHA512:
-  metadata.gz: 1c8dc920900865712ca82fa73de5294f5016aa381d5a2c56e2d920d5c2127904576408eaaf3dda6f5a190c4eceb1fb23a3266ed59560703146ca9217e1e0abbf
-  data.tar.gz: 266b7a4e3cf8e44fdc9302dac49bc4a53647fe6555769d130ff180b89c50c89e702aa7c6fba7ccc362bf287b6231a63ad5cc16832b19150ec16b1438065fe86c
+  metadata.gz: 481374ca51d805690cceee43da33d56b7b2c663664714835618b7e9a5a625afa8415f4a4cecbbc0a87c91ac001b69e9bff35cb62cd41f68abff055b4a0b986cf
+  data.tar.gz: 625a20134275da58d146332c2b1a30e222a5c9c5d86a0b1f41a705b1d7238ebd78163f47711fa5c0a32efc6fb995549728f1b6737c4d25cabaecc181d4259868

data/.github/workflows/ci.yml

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

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v8.0.3
+
+#### Fixed
+
+- [#1306](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1306) Fix affected rows count when lowercase schema reflection enabled
+
+## v8.0.2
+
+#### Fixed
+
+- [#1272](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1272) Fix parsing of raw table name from SQL with extra parentheses
+
 ## v8.0.1
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-8.0.1
+8.0.3

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -39,7 +39,8 @@ module ActiveRecord
         end
 
         def affected_rows(raw_result)
-          raw_result.first['AffectedRows']
+          column_name = lowercase_schema_reflection ? 'affectedrows' : 'AffectedRows'
+          raw_result.first[column_name]
         end
 
         def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -711,7 +711,7 @@ module ActiveRecord
           elsif s.match?(/^\s*UPDATE\s+.*/i)
             s.match(/UPDATE\s+([^\(\s]+)\s*/i)[1]
           else
-            s.match(/FROM\s+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
+            s.match(/FROM[\s|\(]+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
           end.strip
         end
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -3,6 +3,7 @@
 require "tiny_tds"
 require "base64"
 require "active_record"
+require "active_record/connection_adapters/statement_pool"
 require "arel_sqlserver"
 require "active_record/connection_adapters/sqlserver/core_ext/active_record"
 require "active_record/connection_adapters/sqlserver/core_ext/explain"

data/test/cases/adapter_test_sqlserver.rb

@@ -7,6 +7,7 @@ require "models/post"
 require "models/subscriber"
 require "models/minimalistic"
 require "models/college"
+require "models/discount"
 
 class AdapterTestSQLServer < ActiveRecord::TestCase
   fixtures :tasks
@@ -183,6 +184,24 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal "Favorite number?", SSTestUppered.last.column1
       assert SSTestUppered.columns_hash["column2"]
     end
+
+    it "destroys model with no associations" do
+      connection.lowercase_schema_reflection = true
+
+      assert_nothing_raised do
+        discount = Discount.create!
+        discount.destroy!
+      end
+    end
+
+    it "destroys model with association" do
+      connection.lowercase_schema_reflection = true
+
+      assert_nothing_raised do
+        post = Post.create!(title: 'Setup', body: 'Record to be deleted')
+        post.destroy!
+      end
+    end
   end
 
   describe "identity inserts" do

data/test/cases/coerced_tests.rb

@@ -1183,6 +1183,9 @@ module ActiveRecord
         end
       end
 
+      # SQL Server does not support 'restrict' for 'on_update' or 'on_delete'.
+      coerce_tests! :test_remove_foreign_key_with_restrict_action
+
       # Error message depends on the database adapter.
       coerce_tests! :test_add_foreign_key_with_if_not_exists_not_set
       def test_add_foreign_key_with_if_not_exists_not_set_coerced

data/test/cases/schema_test_sqlserver.rb

@@ -101,5 +101,11 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
         assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "INSERT INTO [with].[select notation] SELECT * FROM [table_name]")
       end
     end
+
+    describe 'CREATE VIEW statements' do
+      it do
+        assert_equal "test_table_as", connection.send(:get_raw_table_name, "CREATE VIEW test_views ( test_table_a_id, test_table_b_id ) AS SELECT test_table_as.id as test_table_a_id, test_table_bs.id as test_table_b_id FROM (test_table_as with(nolock) LEFT JOIN test_table_bs with(nolock) ON (test_table_as.id = test_table_bs.test_table_a_id))")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.3
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -238,8 +238,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.1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.3/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.3
 post_install_message:
 rdoc_options: []
 require_paths: