---

mikelehen · JesseLovelace · commit 9be6cdc63378 · 2019-01-22T10:57:33.000-08:00
yaml --- r: 18097 b: refs/heads/pubsub-ordering-keys c: ed7bc85 h: refs/heads/master i: 18095: 524f133
diff --git a/[refs] b/[refs]
@@ -159,7 +159,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: c9f7d7bb12a08f084dd826f27ce997db658dc86b
+refs/heads/pubsub-ordering-keys: ed7bc857a05b34eed6be182d4798a62bf09cd394
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
@@ -398,7 +398,7 @@ boolean areTimestampsInSnapshotsEnabled() {
 
   /** Returns the name of the Firestore project associated with this client. */
   String getDatabaseName() {
-    return databasePath.toString();
+    return databasePath.getDatabaseName().toString();
   }
 
   /** Returns the underlying RPC client. */
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java
@@ -127,9 +127,8 @@ String getPath() {
    */
   String getName() {
     String path = getPath();
-
     if (path.isEmpty()) {
-      return getDatabaseName().toString();
+      return getDatabaseName() + "/documents";
     } else {
       return getDatabaseName() + "/documents/" + getPath();
     }
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
@@ -435,7 +435,7 @@ public static RunQueryRequest query(StructuredQuery... query) {
   public static RunQueryRequest query(
       @Nullable ByteString transactionId, StructuredQuery... query) {
     RunQueryRequest.Builder request = RunQueryRequest.newBuilder();
-    request.setParent(LocalFirestoreHelper.DATABASE_NAME);
+    request.setParent(LocalFirestoreHelper.DATABASE_NAME + "/documents");
     StructuredQuery.Builder structuredQuery = request.getStructuredQueryBuilder();
     structuredQuery.addFrom(
         StructuredQuery.CollectionSelector.newBuilder().setCollectionId("coll"));

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ boolean areTimestampsInSnapshotsEnabled() {`
`398`	`398`
`399`	`399`	`/** Returns the name of the Firestore project associated with this client. */`
`400`	`400`	`String getDatabaseName() {`
`401`		`- return databasePath.toString();`
	`401`	`+ return databasePath.getDatabaseName().toString();`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`/** Returns the underlying RPC client. */`