---

mikelehen · JesseLovelace · commit 1b98de6eb1d7 · 2019-01-22T10:57:33.000-08:00
yaml --- r: 15093 b: refs/heads/autosynth-bigquerydatatransfer c: ed7bc85 h: refs/heads/master i: 15091: 11efd03
diff --git a/[refs] b/[refs]
@@ -124,7 +124,7 @@ refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
 refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
 refs/heads/autosynth-asset: cd8251de8c40e239ad24dcf9ed93ea2708a3eed5
 refs/heads/autosynth-automl: cced2f56bbef0499609073edbca6253e1df5e535
-refs/heads/autosynth-bigquerydatatransfer: c9f7d7bb12a08f084dd826f27ce997db658dc86b
+refs/heads/autosynth-bigquerydatatransfer: ed7bc857a05b34eed6be182d4798a62bf09cd394
 refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28
 refs/heads/autosynth-bigtable: fa0d1de9e264d7ecac8a3abc3de7a8364cfaf427
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
diff --git a/branches/autosynth-bigquerydatatransfer/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/branches/autosynth-bigquerydatatransfer/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/autosynth-bigquerydatatransfer/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/branches/autosynth-bigquerydatatransfer/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/autosynth-bigquerydatatransfer/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/branches/autosynth-bigquerydatatransfer/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. */`