SKAUL05
diff --git a/‎firestore/cloud-client/requirements.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎firestore/cloud-client/requirements.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎firestore/cloud-client/snippets.py
Copy file name to clipboardExpand all lines: firestore/cloud-client/snippets.py
+62-1Lines changed: 62 additions & 1 deletion b/‎firestore/cloud-client/snippets.py
Copy file name to clipboardExpand all lines: firestore/cloud-client/snippets.py
+62-1Lines changed: 62 additions & 1 deletion
diff --git a/‎firestore/cloud-client/snippets_test.py
Copy file name to clipboardExpand all lines: firestore/cloud-client/snippets_test.py
+14Lines changed: 14 additions & 0 deletions b/‎firestore/cloud-client/snippets_test.py
Copy file name to clipboardExpand all lines: firestore/cloud-client/snippets_test.py
+14Lines changed: 14 additions & 0 deletions
@@ -1 +1 @@
-google-cloud-firestore==0.31.0
+google-cloud-firestore==1.1.0
@@ -15,7 +15,7 @@
 from time import sleep
 
 from google.cloud import firestore
-from google.cloud.firestore_v1beta1 import ArrayRemove, ArrayUnion
+from google.cloud.firestore_v1 import ArrayRemove, ArrayUnion
 import google.cloud.exceptions
 
 
@@ -815,3 +815,64 @@ def delete_collection(coll_ref, batch_size):
     # [END delete_full_collection]
 
     delete_collection(db.collection(u'cities'), 10)
+
+
+def collection_group_query(db):
+    # [START fs_collection_group_query_data_setup]
+    cities = db.collection(u'cities')
+
+    sf_landmarks = cities.document(u'SF').collection(u'landmarks')
+    sf_landmarks.document().set({
+        u'name': u'Golden Gate Bridge',
+        u'type': u'bridge'
+    })
+    sf_landmarks.document().set({
+        u'name': u'Legion of Honor',
+        u'type': u'museum'
+    })
+    la_landmarks = cities.document(u'LA').collection(u'landmarks')
+    la_landmarks.document().set({
+        u'name': u'Griffith Park',
+        u'type': u'park'
+    })
+    la_landmarks.document().set({
+        u'name': u'The Getty',
+        u'type': u'museum'
+    })
+    dc_landmarks = cities.document(u'DC').collection(u'landmarks')
+    dc_landmarks.document().set({
+        u'name': u'Lincoln Memorial',
+        u'type': u'memorial'
+    })
+    dc_landmarks.document().set({
+        u'name': u'National Air and Space Museum',
+        u'type': u'museum'
+    })
+    tok_landmarks = cities.document(u'TOK').collection(u'landmarks')
+    tok_landmarks.document().set({
+        u'name': u'Ueno Park',
+        u'type': u'park'
+    })
+    tok_landmarks.document().set({
+        u'name': u'National Museum of Nature and Science',
+        u'type': u'museum'
+    })
+    bj_landmarks = cities.document(u'BJ').collection(u'landmarks')
+    bj_landmarks.document().set({
+        u'name': u'Jingshan Park',
+        u'type': u'park'
+    })
+    bj_landmarks.document().set({
+        u'name': u'Beijing Ancient Observatory',
+        u'type': u'museum'
+    })
+    # [END fs_collection_group_query_data_setup]
+
+    # [START fs_collection_group_query]
+    museums = db.collection_group(u'landmarks')\
+        .where(u'type', u'==', u'museum')
+    docs = museums.get()
+    for doc in docs:
+        print(u'{} => {}'.format(doc.id, doc.to_dict()))
+    # [END fs_collection_group_query]
+    return docs
@@ -255,3 +255,17 @@ def test_listen_for_changes(capsys):
 
 def test_delete_full_collection():
     snippets.delete_full_collection()
+
+
+@pytest.mark.skip(reason="Dependant on a composite index being created,"
+                         "however creation of the index is dependent on"
+                         "having the admin client and definition integrated"
+                         "into the test setup")
+# TODO: b/132092178
+def test_collection_group_query(db):
+    museum_docs = snippets.collection_group_query(db)
+    names = set([museum.name for museum in museum_docs])
+    assert names == {u'Legion of Honor', u'The Getty',
+                     u'National Air and Space Museum',
+                     u'National Museum of Nature and Science',
+                     u'Beijing Ancient Observatory'}
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-google-cloud-firestore==0.31.0`
	`1`	`+google-cloud-firestore==1.1.0`