File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed
activerecord/lib/active_record/encryption Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ def fixed?
50
50
end
51
51
52
52
def key_provider
53
- @key_provider_param || build_key_provider || default_key_provider
53
+ @key_provider_param || key_provider_from_key || deterministic_key_provider || default_key_provider
54
54
end
55
55
56
56
def merge ( other_scheme )
@@ -80,10 +80,14 @@ def validate_config!
80
80
raise Errors ::Configuration , "key_provider: and key: can't be used simultaneously" if @key_provider_param && @key
81
81
end
82
82
83
- def build_key_provider
84
- return DerivedSecretKeyProvider . new ( @key ) if @key . present?
83
+ def key_provider_from_key
84
+ @key_provider_from_key ||= if @key . present?
85
+ DerivedSecretKeyProvider . new ( @key )
86
+ end
87
+ end
85
88
86
- if @deterministic
89
+ def deterministic_key_provider
90
+ @deterministic_key_provider ||= if @deterministic
87
91
DeterministicKeyProvider . new ( ActiveRecord ::Encryption . config . deterministic_key )
88
92
end
89
93
end
You can’t perform that action at this time.
0 commit comments