activerecord-sqlserver-adapter 7.2.8 → 7.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388f899978fa08e71bc46c3b654dd2d41ac1e3dd49e4a3b781c1d20d983698b3
-  data.tar.gz: b4df1bd77d215f3c0c1d1d6ea3ca101b04588ce08bdcbe4f79a446f3c5b88370
+  metadata.gz: aeac1dd3621ed52e93f365fefbca8a0e83ffcfbdac6b01907260efa98db1069f
+  data.tar.gz: daa368ec2b8e38e25aaab374640a29e7d6a5482a78609b32cabefdc716a01b78
 SHA512:
-  metadata.gz: d407a6ef73809b08a2a7f59c04575e5986b1a788fa891f028d3e25757aa71802e4bb2e98459e45f42ddf6c316974516b3b08ba3c79e20ac5424ab4e5df99db67
-  data.tar.gz: 4106b42012e5d0596ae1924055a3d8f92989fc35fa7882c70877b4ba35a5233e26d35a7ed1265ed8f15abbc8f2483967449c3923096a6457f8e9681c47dec7bf
+  metadata.gz: 0ca3530b11fd81b695bde3264fd2daaa221c7f21a7c6e86cbfef14bdf4a60b4aba26238aec58c2456d953fb1aa933c27c0800978061ad71889b0e92fc6a4ebf7
+  data.tar.gz: 5b3b6bbf751511101b26d319554ec1f394fc0d4a76250812146e7400a342b31aa60cb314406f4352f27a49b04fdfa79cf41c7cba12c916b866df6254bf0ddf03

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v7.2.9
+
+#### Fixed
+
+- [#1371](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1371) Fixed query logging so that filter parameters are respected.
+
 ## v7.2.8
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-7.2.8
+7.2.9

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

@@ -34,12 +34,13 @@ module ActiveRecord
           check_if_write_query(sql)
           mark_transaction_written_if_write(sql)
 
-          unless without_prepared_statement?(binds)
-            types, params = sp_executesql_types_and_parameters(binds)
-            sql = sp_executesql_sql(sql, types, params, name)
-          end
+          type_casted_binds = type_casted_binds(binds)
+          log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
+            unless without_prepared_statement?(binds)
+              types, params = sp_executesql_types_and_parameters(binds)
+              sql = sp_executesql_sql(sql, types, params, name)
+            end
 
-          log(sql, name, binds, async: async) do |notification_payload|
             with_raw_connection do |conn|
               result = if id_insert_table_name = query_requires_identity_insert?(sql)
                          with_identity_insert_enabled(id_insert_table_name, conn) do

data/test/cases/coerced_tests.rb

@@ -248,7 +248,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   def test_belongs_to_coerced
     client = Client.find(3)
     first_firm = companies(:first_firm)
-    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
+    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY/) do
       assert_equal first_firm, client.firm
       assert_equal first_firm.name, client.firm.name
     end
@@ -257,21 +257,6 @@ end
 
 module ActiveRecord
   class BindParameterTest < ActiveRecord::TestCase
-    # Same as original coerced test except log is found using `EXEC sp_executesql` wrapper.
-    coerce_tests! :test_binds_are_logged
-    def test_binds_are_logged_coerced
-      sub   = Arel::Nodes::BindParam.new(1)
-      binds = [Relation::QueryAttribute.new("id", 1, Type::Value.new)]
-      sql   = "select * from topics where id = #{sub.to_sql}"
-
-      @connection.exec_query(sql, "SQL", binds)
-
-      logged_sql = "EXEC sp_executesql N'#{sql}', N'#{sub.to_sql} int', #{sub.to_sql} = 1"
-      message = @subscriber.calls.find { |args| args[4][:sql] == logged_sql }
-
-      assert_equal binds, message[4][:binds]
-    end
-
     # SQL Server adapter does not use a statement cache as query plans are already reused using `EXEC sp_executesql`.
     coerce_tests! :test_statement_cache
     coerce_tests! :test_statement_cache_with_query_cache
@@ -279,55 +264,6 @@ module ActiveRecord
     coerce_tests! :test_statement_cache_with_find_by
     coerce_tests! :test_statement_cache_with_in_clause
     coerce_tests! :test_statement_cache_with_sql_string_literal
-
-    # Same as original coerced test except prepared statements include `EXEC sp_executesql` wrapper.
-    coerce_tests! :test_bind_params_to_sql_with_prepared_statements, :test_bind_params_to_sql_with_unprepared_statements
-    def test_bind_params_to_sql_with_prepared_statements_coerced
-      assert_bind_params_to_sql_coerced(prepared: true)
-    end
-
-    def test_bind_params_to_sql_with_unprepared_statements_coerced
-      @connection.unprepared_statement do
-        assert_bind_params_to_sql_coerced(prepared: false)
-      end
-    end
-
-    private
-
-    def assert_bind_params_to_sql_coerced(prepared:)
-      table = Author.quoted_table_name
-      pk = "#{table}.#{Author.quoted_primary_key}"
-
-      # prepared_statements: true
-      #
-      #   EXEC sp_executesql N'SELECT [authors].* FROM [authors] WHERE [authors].[id] IN (@0, @1, @2) OR [authors].[id] IS NULL)', N'@0 bigint, @1 bigint, @2 bigint', @0 = 1, @1 = 2, @2 = 3
-      #
-      # prepared_statements: false
-      #
-      #   SELECT [authors].* FROM [authors] WHERE ([authors].[id] IN (1, 2, 3) OR [authors].[id] IS NULL)
-      #
-      sql_unprepared = "SELECT #{table}.* FROM #{table} WHERE (#{pk} IN (#{bind_params(1..3)}) OR #{pk} IS NULL)"
-      sql_prepared = "EXEC sp_executesql N'SELECT #{table}.* FROM #{table} WHERE (#{pk} IN (#{bind_params(1..3)}) OR #{pk} IS NULL)', N'@0 bigint, @1 bigint, @2 bigint', @0 = 1, @1 = 2, @2 = 3"
-
-      authors = Author.where(id: [1, 2, 3, nil])
-      assert_equal sql_unprepared, @connection.to_sql(authors.arel)
-      assert_queries_match(prepared ? sql_prepared : sql_unprepared) { assert_equal 3, authors.length }
-
-      # prepared_statements: true
-      #
-      #   EXEC sp_executesql N'SELECT [authors].* FROM [authors] WHERE [authors].[id] IN (@0, @1, @2)', N'@0 bigint, @1 bigint, @2 bigint', @0 = 1, @1 = 2, @2 = 3
-      #
-      # prepared_statements: false
-      #
-      #   SELECT [authors].* FROM [authors] WHERE [authors].[id] IN (1, 2, 3)
-      #
-      sql_unprepared = "SELECT #{table}.* FROM #{table} WHERE #{pk} IN (#{bind_params(1..3)})"
-      sql_prepared = "EXEC sp_executesql N'SELECT #{table}.* FROM #{table} WHERE #{pk} IN (#{bind_params(1..3)})', N'@0 bigint, @1 bigint, @2 bigint', @0 = 1, @1 = 2, @2 = 3"
-
-      authors = Author.where(id: [1, 2, 3, 9223372036854775808])
-      assert_equal sql_unprepared, @connection.to_sql(authors.arel)
-      assert_queries_match(prepared ? sql_prepared : sql_unprepared) { assert_equal 3, authors.length }
-    end
   end
 end
 
@@ -387,7 +323,7 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_predicate accounts, :loaded?
     assert_equal expected, accounts.count(:id)
   end
-  
+
   # Fix randomly failing test. The loading of the model's schema was affecting the test.
   coerce_tests! :test_offset_is_kept
   def test_offset_is_kept_coerced
@@ -508,7 +444,7 @@ class CalculationsTest < ActiveRecord::TestCase
   def test_limit_is_kept_coerced
     queries = capture_sql { Account.limit(1).count }
     assert_equal 1, queries.length
-    assert_match(/ORDER BY \[accounts\]\.\[id\] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.*@0 = 1/, queries.first)
+    assert_match(/ORDER BY \[accounts\]\.\[id\] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/, queries.first)
   end
 
   # Match SQL Server limit implementation
@@ -516,7 +452,7 @@ class CalculationsTest < ActiveRecord::TestCase
   def test_limit_with_offset_is_kept_coerced
     queries = capture_sql { Account.limit(1).offset(1).count }
     assert_equal 1, queries.length
-    assert_match(/ORDER BY \[accounts\]\.\[id\] ASC OFFSET @0 ROWS FETCH NEXT @1 ROWS ONLY.*@0 = 1, @1 = 1/, queries.first)
+    assert_match(/ORDER BY \[accounts\]\.\[id\] ASC OFFSET @0 ROWS FETCH NEXT @1 ROWS ONLY/, queries.first)
   end
 
   # SQL Server needs an alias for the calculated column
@@ -980,9 +916,9 @@ class FinderTest < ActiveRecord::TestCase
   # Assert SQL Server limit implementation
   coerce_tests! :test_take_and_first_and_last_with_integer_should_use_sql_limit
   def test_take_and_first_and_last_with_integer_should_use_sql_limit_coerced
-    assert_queries_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.* @0 = 3/) { Topic.take(3).entries }
-    assert_queries_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.* @0 = 2/) { Topic.first(2).entries }
-    assert_queries_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.* @0 = 5/) { Topic.last(5).entries }
+    assert_queries_and_values_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/, [3]) { Topic.take(3).entries }
+    assert_queries_and_values_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/, [2]) { Topic.first(2).entries }
+    assert_queries_and_values_match(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/, [5]) { Topic.last(5).entries }
   end
 
   # This fails only when run in the full test suite task. Just taking it out of the mix.
@@ -1013,7 +949,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_include_on_unloaded_relation_with_match
   def test_include_on_unloaded_relation_with_match_coerced
-    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY.*@2 = 1/) do
+    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY/) do
       assert_equal true, Customer.where(name: "David").include?(customers(:david))
     end
   end
@@ -1021,7 +957,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_include_on_unloaded_relation_without_match
   def test_include_on_unloaded_relation_without_match_coerced
-    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY.*@2 = 1/) do
+    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY/) do
       assert_equal false, Customer.where(name: "David").include?(customers(:mary))
     end
   end
@@ -1029,7 +965,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_member_on_unloaded_relation_with_match
   def test_member_on_unloaded_relation_with_match_coerced
-    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY.*@2 = 1/) do
+    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY/) do
       assert_equal true, Customer.where(name: "David").member?(customers(:david))
     end
   end
@@ -1037,7 +973,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_member_on_unloaded_relation_without_match
   def test_member_on_unloaded_relation_without_match_coerced
-    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY.*@2 = 1/) do
+    assert_queries_match(/1 AS one.*FETCH NEXT @2 ROWS ONLY/) do
       assert_equal false, Customer.where(name: "David").member?(customers(:mary))
     end
   end
@@ -1052,7 +988,7 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal topics(:third), Topic.last
 
     c = Topic.lease_connection
-    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.title"))} DESC, #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.*@0 = 1/i) {
+    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.title"))} DESC, #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/i) {
       Topic.last
     }
   ensure
@@ -1066,7 +1002,7 @@ class FinderTest < ActiveRecord::TestCase
     Topic.implicit_order_column = "id"
 
     c = Topic.lease_connection
-    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.*@0 = 1/i) {
+    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/i) {
       Topic.last
     }
   ensure
@@ -1081,7 +1017,7 @@ class FinderTest < ActiveRecord::TestCase
 
     c = NonPrimaryKey.lease_connection
 
-    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("non_primary_keys.created_at"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.*@0 = 1/i) {
+    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("non_primary_keys.created_at"))} DESC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY/i) {
       NonPrimaryKey.last
     }
   ensure
@@ -1091,7 +1027,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_member_on_unloaded_relation_with_composite_primary_key
   def test_member_on_unloaded_relation_with_composite_primary_key_coerced
-    assert_queries_match(/1 AS one.* FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/) do
+    assert_queries_match(/1 AS one.* FETCH NEXT @(\d) ROWS ONLY/) do
       book = cpk_books(:cpk_great_author_first_book)
       assert Cpk::Book.where(title: "The first book").member?(book)
     end
@@ -1106,7 +1042,7 @@ class FinderTest < ActiveRecord::TestCase
     quoted_color = Regexp.escape(c.quote_table_name("clothing_items.color"))
     quoted_descrption = Regexp.escape(c.quote_table_name("clothing_items.description"))
 
-    assert_queries_match(/ORDER BY #{quoted_descrption} ASC, #{quoted_type} ASC, #{quoted_color} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/i) do
+    assert_queries_match(/ORDER BY #{quoted_descrption} ASC, #{quoted_type} ASC, #{quoted_color} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       assert_kind_of ClothingItem, ClothingItem.first
     end
   ensure
@@ -1120,7 +1056,7 @@ class FinderTest < ActiveRecord::TestCase
     quoted_type = Regexp.escape(c.quote_table_name("clothing_items.clothing_type"))
     quoted_color = Regexp.escape(c.quote_table_name("clothing_items.color"))
 
-    assert_queries_match(/ORDER BY #{quoted_type} DESC, #{quoted_color} DESC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/i) do
+    assert_queries_match(/ORDER BY #{quoted_type} DESC, #{quoted_color} DESC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       assert_kind_of ClothingItem, ClothingItem.last
     end
   end
@@ -1132,7 +1068,7 @@ class FinderTest < ActiveRecord::TestCase
     quoted_type = Regexp.escape(c.quote_table_name("clothing_items.clothing_type"))
     quoted_color = Regexp.escape(c.quote_table_name("clothing_items.color"))
 
-    assert_queries_match(/ORDER BY #{quoted_type} ASC, #{quoted_color} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/i) do
+    assert_queries_match(/ORDER BY #{quoted_type} ASC, #{quoted_color} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       assert_kind_of ClothingItem, ClothingItem.first
     end
   end
@@ -1145,7 +1081,7 @@ class FinderTest < ActiveRecord::TestCase
     quoted_type = Regexp.escape(c.quote_table_name("clothing_items.clothing_type"))
     quoted_color = Regexp.escape(c.quote_table_name("clothing_items.color"))
 
-    assert_queries_match(/ORDER BY #{quoted_color} ASC, #{quoted_type} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/i) do
+    assert_queries_match(/ORDER BY #{quoted_color} ASC, #{quoted_type} ASC OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       assert_kind_of ClothingItem, ClothingItem.first
     end
   ensure
@@ -1155,7 +1091,7 @@ class FinderTest < ActiveRecord::TestCase
   # Check for `FETCH NEXT x ROWS` rather then `LIMIT`.
   coerce_tests! :test_include_on_unloaded_relation_with_composite_primary_key
   def test_include_on_unloaded_relation_with_composite_primary_key_coerced
-    assert_queries_match(/1 AS one.*OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1/) do
+    assert_queries_match(/1 AS one.*OFFSET 0 ROWS FETCH NEXT @(\d) ROWS ONLY/) do
       book = cpk_books(:cpk_great_author_first_book)
       assert Cpk::Book.where(title: "The first book").include?(book)
     end
@@ -1165,11 +1101,11 @@ class FinderTest < ActiveRecord::TestCase
   coerce_tests! :test_nth_to_last_with_order_uses_limit
   def test_nth_to_last_with_order_uses_limit_coerced
     c = Topic.lease_connection
-    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET @(\d) ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1.*@\2 = 1/i) do
+    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.id"))} DESC OFFSET @(\d) ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       Topic.second_to_last
     end
 
-    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.updated_at"))} DESC OFFSET @(\d) ROWS FETCH NEXT @(\d) ROWS ONLY.*@\1 = 1.*@\2 = 1/i) do
+    assert_queries_match(/ORDER BY #{Regexp.escape(c.quote_table_name("topics.updated_at"))} DESC OFFSET @(\d) ROWS FETCH NEXT @(\d) ROWS ONLY/i) do
       Topic.order(:updated_at).second_to_last
     end
   end
@@ -1217,7 +1153,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   def test_has_one_coerced
     firm = companies(:first_firm)
     first_account = Account.find(1)
-    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
+    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY/) do
       assert_equal first_account, firm.account
       assert_equal first_account.credit_limit, firm.account.credit_limit
     end
@@ -1229,7 +1165,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   coerce_tests! :test_has_one_through_executes_limited_query
   def test_has_one_through_executes_limited_query_coerced
     boring_club = clubs(:boring_club)
-    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
+    assert_queries_match(/FETCH NEXT @(\d) ROWS ONLY/) do
       assert_equal boring_club, @member.general_club
     end
   end
@@ -1436,7 +1372,7 @@ class RelationTest < ActiveRecord::TestCase
   # Find any limit via our expression.
   coerce_tests! %r{relations don't load all records in #inspect}
   def test_relations_dont_load_all_records_in_inspect_coerced
-    assert_queries_match(/NEXT @0 ROWS.*@0 = \d+/) do
+    assert_queries_match(/NEXT @0 ROWS/) do
       Post.all.inspect
     end
   end
@@ -2124,7 +2060,7 @@ class RelationMergingTest < ActiveRecord::TestCase
     non_mary_and_bob = Author.where.not(id: [mary, bob])
 
     author_id = Author.lease_connection.quote_table_name("authors.id")
-    assert_queries_match(/WHERE #{Regexp.escape(author_id)} NOT IN \((@\d), \g<1>\)'/) do
+    assert_queries_match(/WHERE #{Regexp.escape(author_id)} NOT IN \((@\d), \g<1>\)/) do
       assert_equal [david], non_mary_and_bob.merge(non_mary_and_bob)
     end
 
@@ -2262,14 +2198,6 @@ class LogSubscriberTest < ActiveRecord::TestCase
   def test_verbose_query_logs_coerced
     original_test_verbose_query_logs
   end
-
-  # Bindings logged slightly differently.
-  coerce_tests! :test_where_in_binds_logging_include_attribute_names
-  def test_where_in_binds_logging_include_attribute_names_coerced
-    Developer.where(id: [1, 2, 3, 4, 5]).load
-    wait
-    assert_match(%{@0 = 1, @1 = 2, @2 = 3, @3 = 4, @4 = 5  [["id", nil], ["id", nil], ["id", nil], ["id", nil], ["id", nil]]}, @logger.logged(:debug).last)
-  end
 end
 
 class ReloadModelsTest < ActiveRecord::TestCase
@@ -2337,7 +2265,7 @@ class PreloaderTest < ActiveRecord::TestCase
 
     c = Cpk::OrderAgreement.lease_connection
     order_id_column = Regexp.escape(c.quote_table_name("cpk_order_agreements.order_id"))
-    order_id_constraint = /#{order_id_column} = @0.*@0 = \d+$/
+    order_id_constraint = /#{order_id_column} = @0$/
     expectation = /SELECT.*WHERE.* #{order_id_constraint}/
 
     assert_match(expectation, preload_sql)
@@ -2361,7 +2289,7 @@ class PreloaderTest < ActiveRecord::TestCase
 
     c = Cpk::Order.lease_connection
     order_id = Regexp.escape(c.quote_table_name("cpk_orders.id"))
-    order_constraint = /#{order_id} = @0.*@0 = \d+$/
+    order_constraint = /#{order_id} = @0$/
     expectation = /SELECT.*WHERE.* #{order_constraint}/
 
     assert_match(expectation, preload_sql)
@@ -2432,7 +2360,7 @@ class QueryLogsTest < ActiveRecord::TestCase
   coerce_tests! :test_sql_commenter_format
   def test_sql_commenter_format_coerced
     ActiveRecord::QueryLogs.update_formatter(:sqlcommenter)
-    assert_queries_match(%r{/\*application=''active_record''\*/}) do
+    assert_queries_match(%r{/\*application='active_record'\*/}) do
       Dashboard.first
     end
   end
@@ -2447,7 +2375,7 @@ class QueryLogsTest < ActiveRecord::TestCase
       { tracestate: "congo=t61rcWkgMzE,rojo=00f067aa0ba902b7", custom_proc: -> { "Joe's Shack" } },
     ]
 
-    assert_queries_match(%r{custom_proc=''Joe%27s%20Shack'',tracestate=''congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7''\*/}) do
+    assert_queries_match(%r{custom_proc='Joe%27s%20Shack',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7'\*/}) do
       Dashboard.first
     end
   end
@@ -2462,7 +2390,7 @@ class QueryLogsTest < ActiveRecord::TestCase
       { custom_proc: -> { 1234 } },
     ]
 
-    assert_queries_match(%r{custom_proc=''1234''\*/}) do
+    assert_queries_match(%r{custom_proc='1234'\*/}) do
       Dashboard.first
     end
   end
@@ -2481,7 +2409,7 @@ class QueryLogsTest < ActiveRecord::TestCase
       },
     ]
 
-    assert_queries_match(%r{custom_proc=''Joe%27s%20Shack'',string=''value'',tracestate=''congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7''\*/}) do
+    assert_queries_match(%r{custom_proc='Joe%27s%20Shack',string='value',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7'\*/}) do
       Dashboard.first
     end
   end
@@ -2705,7 +2633,7 @@ class ExplainTest < ActiveRecord::TestCase
   def test_relation_explain_with_first_coerced
     expected_query = capture_sql {
       Car.all.first
-    }.first[/EXEC sp_executesql N'(.*?) NEXT/, 1]
+    }.first[/(.*?) NEXT/, 1]
     message = Car.all.explain.first
     assert_match(/^EXPLAIN/, message)
     assert_match(expected_query, message)
@@ -2716,7 +2644,7 @@ class ExplainTest < ActiveRecord::TestCase
   def test_relation_explain_with_last_coerced
     expected_query = capture_sql {
       Car.all.last
-    }.first[/EXEC sp_executesql N'(.*?) NEXT/, 1]
+    }.first[/(.*?) NEXT/, 1]
     expected_query = expected_query
     message = Car.all.explain.last
 

data/test/cases/optimizer_hints_test_sqlserver.rb

@@ -29,7 +29,7 @@ class OptimizerHitsTestSQLServer < ActiveRecord::TestCase
   end
 
   it "support subqueries" do
-    assert_queries_match(%r{.*'SELECT COUNT\(count_column\) FROM \(SELECT .*\) subquery_for_count OPTION \(MAXDOP 2\)'.*}) do
+    assert_queries_match(%r{SELECT COUNT\(count_column\) FROM \(SELECT .*\) subquery_for_count OPTION \(MAXDOP 2\)}) do
       companies = Company.optimizer_hints("MAXDOP 2")
       companies = companies.select(:id).where(firm_id: [0, 1]).limit(3)
       assert_equal 3, companies.count

data/test/cases/showplan_test_sqlserver.rb

@@ -28,13 +28,13 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
 
     it "from array condition using index" do
       plan = Car.where(id: [1, 2]).explain.inspect
-      _(plan).must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id] IN (1, 2)"
+      _(plan).must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id]"
       _(plan).must_include "Clustered Index Seek", "make sure we do not showplan the sp_executesql"
     end
 
     it "from array condition" do
       plan = Car.where(name: ["honda", "zyke"]).explain.inspect
-      _(plan).must_include " SELECT [cars].* FROM [cars] WHERE [cars].[name] IN (N'honda', N'zyke')"
+      _(plan).must_include " SELECT [cars].* FROM [cars] WHERE [cars].[name]"
       _(plan).must_include "Clustered Index Scan", "make sure we do not showplan the sp_executesql"
     end
   end

data/test/cases/specific_schema_test_sqlserver.rb

@@ -116,16 +116,16 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
       end
     end
     # Using ActiveRecord's quoted_id feature for objects.
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: value.new).first }
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: value.new).first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(char_col: value.new).first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(varchar_col: value.new).first }
     # Using our custom char type data.
     type = ActiveRecord::Type::SQLServer::Char
     data = ActiveRecord::Type::SQLServer::Data
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: data.new("T", type.new)).first }
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: data.new("T", type.new)).first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(char_col: data.new("T", type.new)).first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(varchar_col: data.new("T", type.new)).first }
     # Taking care of everything.
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: "T").first }
-    assert_queries_match(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: "T").first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(char_col: "T").first }
+    assert_queries_and_values_match(/.*/, ["'T'", 1]) { SSTestDatatypeMigration.where(varchar_col: "T").first }
   end
 
   it "can update and hence properly quoted non-national char/varchar columns" do

data/test/support/query_assertions.rb

@@ -22,6 +22,28 @@ module ARTest
         end
       end
 
+      def assert_queries_and_values_match(match, bound_values=[], count: nil, &block)
+        ActiveRecord::Base.lease_connection.materialize_transactions
+
+        counter = ActiveRecord::Assertions::QueryAssertions::SQLCounter.new
+        ActiveSupport::Notifications.subscribed(counter, "sql.active_record") do
+          result = _assert_nothing_raised_or_warn("assert_queries_match", &block)
+          queries = counter.log_full
+          matched_queries = queries.select do |query, values|
+            values = values.map { |v| v.respond_to?(:quoted) ? v.quoted : v }
+            match === query && bound_values === values
+          end
+
+          if count
+            assert_equal count, matched_queries.size, "#{matched_queries.size} instead of #{count} queries were executed.#{count.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"}"
+          else
+            assert_operator matched_queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{counter.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"}"
+          end
+
+          result
+        end
+      end
+
       private
 
       # Rails tests expect a save-point to be created and released. SQL Server does not release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.8
+  version: 7.2.9
 platform: ruby
 authors:
 - Ken Collins
@@ -241,8 +241,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.2.8/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.2.8
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.2.9/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.2.9
 rdoc_options: []
 require_paths:
 - lib