Skip to content
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.

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

[core] Fix 'filterable' info in field schema #11418

Merged
merged 4 commits into from
Mar 18, 2025

Conversation

tdraier
Copy link
Contributor

@tdraier tdraier commented Mar 17, 2025

Reverts #11415 and restore #11408

Now use an optional for non_filterable so that json deserialization does not crash when stored schema does / does not contain "non_filterable"

We have a few entries in db with "filterable:true", but these are safely ignored when deserializing, and will eventually be replaced when reupserting the table.

@tdraier tdraier changed the title Revert "Revert "Add 'filterable' info in field"" [core] Fix 'filterable' info in field schema Mar 17, 2025
@tdraier tdraier marked this pull request as ready for review March 17, 2025 16:30
@tdraier tdraier requested a review from flvndvd March 17, 2025 16:30
Copy link
Contributor

@flvndvd flvndvd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -405,6 +405,10 @@ impl SalesforceRemoteDatabase {
QueryDatabaseError::GenericError(anyhow!("Field `soapType` not found"))
})?;

let filterable = field["filterable"].as_bool().ok_or_else(|| {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feels weird to have the payload different from what we save in DB.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, seen IRL.

@tdraier tdraier merged commit b55115c into main Mar 18, 2025
6 checks passed
@tdraier tdraier deleted the revert-11415-revert-11408-thomas/block-non-queriable branch March 18, 2025 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants