check if there is any orderby clause (#1401)

googleapis · Aug 22, 2023 · 9df7c25 · 9df7c25
1 parent 01f669c
commit 9df7c25
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -1287,7 +1287,9 @@ public Query endAt(Object... fieldValues) {
   }
 
   private void warningOnSingleDocumentReference(Object... fieldValues) {
-    if (fieldValues.length == 1 && fieldValues[0] instanceof DocumentReference) {
+    if (options.getFieldOrders().isEmpty()
+        && fieldValues.length == 1
+        && fieldValues[0] instanceof DocumentReference) {
       LOGGER.warning(
           "Warning: Passing DocumentReference into a cursor without orderBy clause is not an intended "
               + "behavior. Please use DocumentSnapshot or add an explicit orderBy on document key field.");

diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
@@ -614,6 +614,23 @@ public void withDocumentReferenceCursor() {
     assertEquals(queryRequest, runQuery.getValue());
   }
 
+  @Test
+  public void withDocumentIdAndDocumentReferenceCursor() {
+    doAnswer(queryResponse())
+        .when(firestoreMock)
+        .streamRequest(runQuery.capture(), streamObserverCapture.capture(), any());
+
+    DocumentReference documentCursor = firestoreMock.document(DOCUMENT_PATH);
+    Value documentValue = reference(DOCUMENT_NAME);
+
+    query.orderBy(FieldPath.documentId()).startAt(documentCursor).get();
+
+    RunQueryRequest queryRequest =
+        query(order("__name__", StructuredQuery.Direction.ASCENDING), startAt(documentValue, true));
+
+    assertEquals(queryRequest, runQuery.getValue());
+  }
+
   @Test
   public void withExtractedDirectionForDocumentSnapshotCursor() {
     doAnswer(queryResponse())