Fix startAfter/endBefore for orderByKeys queries #7403
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+215
to
+217
| if ([startAfterValue isKindOfClass:[NSString class]]) { | ||
| startAfterValue = [FNextPushId successor:startAfterValue]; | ||
| } |
There was a problem hiding this comment.
What happens when this is not true? Looks like we just call queryStartingAtInternal with the original value, which doesn't seem to do any validation.
There was a problem hiding this comment.
This case is covered by validateQueryEndpointsForParams:
This is called in queryingStartingAtInternal.
schmidt-sebastian
approved these changes
Feb 1, 2021
| @"than string in combination with queryOrderedByKey"]; | ||
| format:@"Can't use queryStartingAtValue: or " | ||
| @"queryStartingAfterValue: " | ||
| @"with other types than string in combination with " |
There was a problem hiding this comment.
Might be easier to understand if it said "with non-string types when used with queryOrderedByKey:"
jmwski
commented
Feb 3, 2021
| excludeWriteIds:@[]]; | ||
| if (![node isEmpty]) { | ||
| id<FNode> node = [self.serverSyncTree getServerValue:[query querySpec]]; | ||
| if (node != nil && ![node isEmpty]) { |
There was a problem hiding this comment.
@schmidt-sebastian I'm stuck here. I can't figure out why [node isEmpty] is needed to pass the two tests:
The equivalent is not needed for the android changes.
Coverage ReportAffected SDKs
Test Logs |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
We should not be passing a fallback key to startAfter if we're querying on a key index. The indexValue is the key in this case.