From a86460477ee6396b2d676dc26d357a93c2d1fec2 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Wed, 14 Jul 2021 17:24:19 +0100 Subject: [PATCH] Coerce and reimplement test Delete records that were created as part of test before adding index back Fix test --- test/cases/coerced_tests.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/cases/coerced_tests.rb b/test/cases/coerced_tests.rb index 28728fc41..4d603513e 100644 --- a/test/cases/coerced_tests.rb +++ b/test/cases/coerced_tests.rb @@ -1521,6 +1521,7 @@ def test_statement_cache_values_differ_coerced original_test_statement_cache_values_differ ensure + Book.where(author_id: nil, name: 'my book').delete_all Book.connection.add_index(:books, [:author_id, :name], unique: true) end end @@ -1748,6 +1749,7 @@ class EnumTest < ActiveRecord::TestCase send(:'original_enums are distinct per class') ensure + Book.where(author_id: nil, name: nil).delete_all Book.connection.add_index(:books, [:author_id, :name], unique: true) end @@ -1758,6 +1760,7 @@ class EnumTest < ActiveRecord::TestCase send(:'original_creating new objects with enum scopes') ensure + Book.where(author_id: nil, name: nil).delete_all Book.connection.add_index(:books, [:author_id, :name], unique: true) end @@ -1768,6 +1771,7 @@ class EnumTest < ActiveRecord::TestCase send(:'original_enums are inheritable') ensure + Book.where(author_id: nil, name: nil).delete_all Book.connection.add_index(:books, [:author_id, :name], unique: true) end @@ -1778,6 +1782,7 @@ class EnumTest < ActiveRecord::TestCase send(:'original_declare multiple enums at a time') ensure + Book.where(author_id: nil, name: nil).delete_all Book.connection.add_index(:books, [:author_id, :name], unique: true) end end @@ -1843,6 +1848,14 @@ class LogSubscriberTest < ActiveRecord::TestCase def test_vebose_query_logs_coerced original_test_vebose_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 ActiveRecordSchemaTest < ActiveRecord::TestCase