Skip to content

Fix serialized encrypted attributes #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Fix serialized encrypted attributes #1218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a2f4dc
Fix serialized encrypted attributes
aidanharan Sep 2, 2024
5f26c0f
Handle normalized types
aidanharan Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/active_record/connection_adapters/sqlserver/database_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,13 @@ def sp_executesql_types_and_parameters(binds)

def sp_executesql_sql_type(attr)
if attr.respond_to?(:type)
return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
type = attr.type.is_a?(ActiveRecord::Normalization::NormalizedValueType) ? attr.type.cast_type : attr.type
type = type.subtype if type.serialized?

if attr.type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType) && attr.type.instance_variable_get(:@cast_type).respond_to?(:sqlserver_type)
return attr.type.instance_variable_get(:@cast_type).sqlserver_type
return type.sqlserver_type if type.respond_to?(:sqlserver_type)

if type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType) && type.instance_variable_get(:@cast_type).respond_to?(:sqlserver_type)
return type.instance_variable_get(:@cast_type).sqlserver_type
end
end

Expand Down
Loading