diff options
| author |  zxu <zxu@google.com> | 2018-03-14 08:57:31 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-14 08:57:31 -0400 |
| commit | 9e815620e9f7f43b42e03db4e5118d7ad03ddee7 (patch) | |
| tree | 86f362bad99281325fca7ee3ae116b6a0f36d511 /Firestore/Source/API/FIRDocumentSnapshot.mm | |
| parent | d4d73ea53ecdf1e8ade3d00921419645dd5d66f7 (diff) | |
grand PR to port the remaining paths (FieldPath and ResourcePath). (#865)
* naively remove FSTPath import and source/test files.
* port FieldPath, part I
* port FieldPath, part II
* port ResourcePath, part I
* port ResourcePath, part II
* the grand commit to fix build errors
* use testutil:: helper instead of those from FSTHelpers
* fix test and lint
* use c_str in errmsg directly
* fix
* fix
* make code clean
* fix integration test I missed
* fix to avoid naming collision in preprocessor
* address changes
* address changes
* address changes
* fix: fieldMask are actually shared with different context.
* address changes
* address changes
Diffstat (limited to 'Firestore/Source/API/FIRDocumentSnapshot.mm')
| -rw-r--r-- | Firestore/Source/API/FIRDocumentSnapshot.mm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Firestore/Source/API/FIRDocumentSnapshot.mm b/Firestore/Source/API/FIRDocumentSnapshot.mm index 8e731da..4d82986 100644 --- a/Firestore/Source/API/FIRDocumentSnapshot.mm +++ b/Firestore/Source/API/FIRDocumentSnapshot.mm @@ -24,7 +24,6 @@ #import "Firestore/Source/Model/FSTDocument.h" #import "Firestore/Source/Model/FSTDocumentKey.h" #import "Firestore/Source/Model/FSTFieldValue.h" -#import "Firestore/Source/Model/FSTPath.h" #import "Firestore/Source/Util/FSTAssert.h" #import "Firestore/Source/Util/FSTUsageValidation.h" @@ -184,12 +183,11 @@ NS_ASSUME_NONNULL_BEGIN // TODO(b/32073923): Log this as a proper warning. NSLog( @"WARNING: Document %@ contains a document reference within a different database " - "(%@/%@) which is not supported. It will be treated as a reference within the " - "current database (%@/%@) instead.", - self.reference.path, util::WrapNSStringNoCopy(refDatabase->project_id()), - util::WrapNSStringNoCopy(refDatabase->database_id()), - util::WrapNSStringNoCopy(database->project_id()), - util::WrapNSStringNoCopy(database->database_id())); + "(%s/%s) which is not supported. It will be treated as a reference within the " + "current database (%s/%s) instead.", + self.reference.path, refDatabase->project_id().c_str(), + refDatabase->database_id().c_str(), database->project_id().c_str(), + database->database_id().c_str()); } return [FIRDocumentReference referenceWithKey:[ref valueWithOptions:options] firestore:self.firestore]; |