From 40abab5c849768e0640577e2a81309f86ba51246 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Wed, 10 Mar 2021 23:50:56 +0100 Subject: [PATCH] Rename to something shorter --- activerecord/lib/active_record/encryption/config.rb | 4 ++-- activerecord/lib/active_record/railtie.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/encryption/config.rb b/activerecord/lib/active_record/encryption/config.rb index 3d8c55dd18..7af2f72bc8 100644 --- a/activerecord/lib/active_record/encryption/config.rb +++ b/activerecord/lib/active_record/encryption/config.rb @@ -4,7 +4,7 @@ module ActiveRecord class Config attr_accessor :master_key, :deterministic_key, :store_key_references, :key_derivation_salt, :support_unencrypted_data, :encrypt_fixtures, :validate_column_size, :add_to_filter_parameters, - :excluded_from_filter_parameters, :extend_queries_to_support_multiple_deterministic_encryption_schemes + :excluded_from_filter_parameters, :extend_queries def initialize set_defaults @@ -20,7 +20,7 @@ module ActiveRecord self.excluded_from_filter_parameters = [] # TODO: Setting to false for now as the implementation is a bit experimental - self.extend_queries_to_support_multiple_deterministic_encryption_schemes = false + self.extend_queries = false end end end diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 4a58de7694..36ce45df0d 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -294,7 +294,7 @@ To keep using the current cache store, you can turn off cache versioning entirel end # Support extended queries for deterministic attributes - if ActiveRecord::Encryption.config.extend_queries_to_support_multiple_deterministic_encryption_schemes + if ActiveRecord::Encryption.config.extend_queries ActiveRecord::Encryption::ExtendedDeterministicQueries.install_support end