refactor(sanity): fix type issues with collate, update tests and readQueryResult #7587
+21
−13
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
QueryResult
interfaceWhen rebasing against
next
something went wrong specifically around this PR. I wasn't able to fix it by using rebasing however this unblocks us and allows us to continue work.I imagine that the fix will likely be more around making sure that the collate prop type stayed the same (making the changes in the ENABLE_LRU_MEMO changes however I don't know the larger impact of making that change, so, for now I've set this up.
Folks that are more knowledgeable around this should weight in before I merge since this is more like a temporary bandaid than a fix 🥲
Ash set up a branch
corel-pre-rebase-20241003
in case if you want to give the rebase another stab to avoid some of these issues. Keep in mind that you'll need to cherry pick StickParams commits as well