updated collection classes

Author: daniel-sanche

google/cloud/firestore_v1/base_collection.py

@@ -48,6 +48,7 @@
     from google.cloud.firestore_v1.async_document import AsyncDocumentReference
     from google.cloud.firestore_v1.document import DocumentReference
     from google.cloud.firestore_v1.field_path import FieldPath
+    from google.cloud.firestore_v1.pipeline_source import PipelineSource
     from google.cloud.firestore_v1.query_profile import ExplainOptions
     from google.cloud.firestore_v1.query_results import QueryResultsList
     from google.cloud.firestore_v1.stream_generator import StreamGenerator
@@ -602,18 +603,20 @@ def find_nearest(
             distance_threshold=distance_threshold,
         )
 
-    def pipeline(self):
+    def _build_pipeline(self, source: "PipelineSource"):
         """
         Convert this query into a Pipeline
 
         Queries containing a `cursor` or `limit_to_last` are not currently supported
 
+        Args:
+            source: the PipelineSource to build the pipeline off o
         Raises:
             - NotImplementedError: raised if the query contains a `cursor` or `limit_to_last`
         Returns:
             a Pipeline representing the query
         """
-        return self._query().pipeline()
+        return self._query()._build_pipeline(source)
 
 
 def _auto_id() -> str:

tests/unit/v1/test_async_collection.py

@@ -609,15 +609,9 @@ def test_asynccollectionreference_pipeline():
 
     client = make_async_client()
     collection = _make_async_collection_reference("collection", client=client)
-    pipeline = collection.pipeline()
+    pipeline = collection._build_pipeline(client.pipeline())
     assert isinstance(pipeline, AsyncPipeline)
     # should have single "Collection" stage
     assert len(pipeline.stages) == 1
     assert isinstance(pipeline.stages[0], Collection)
-    assert pipeline.stages[0].path == "/collection"
-
-
-def test_asynccollectionreference_pipeline_no_client():
-    collection = _make_async_collection_reference("collection")
-    with pytest.raises(ValueError, match="client"):
-        collection.pipeline()
+    assert pipeline.stages[0].path == "/collection"

tests/unit/v1/test_base_collection.py

@@ -430,10 +430,11 @@ def test_basecollectionreference_pipeline(mock_query):
         _query.return_value = mock_query
 
         collection = _make_base_collection_reference("collection")
-        pipeline = collection.pipeline()
+        mock_source = mock.Mock()
+        pipeline = collection._build_pipeline(mock_source)
 
-        mock_query.pipeline.assert_called_once_with()
-        assert pipeline == mock_query.pipeline.return_value
+        mock_query._build_pipeline.assert_called_once_with(mock_source)
+        assert pipeline == mock_query._build_pipeline.return_value
 
 
 @mock.patch("random.choice")

tests/unit/v1/test_collection.py

@@ -518,20 +518,14 @@ def test_collectionreference_pipeline():
 
     client = _test_helpers.make_client()
     collection = _make_collection_reference("collection", client=client)
-    pipeline = collection.pipeline()
+    pipeline = collection._build_pipeline(client.pipeline())
     assert isinstance(pipeline, Pipeline)
     # should have single "Collection" stage
     assert len(pipeline.stages) == 1
     assert isinstance(pipeline.stages[0], Collection)
     assert pipeline.stages[0].path == "/collection"
 
 
-def test_collectionreference_pipeline_no_client():
-    collection = _make_collection_reference("collection")
-    with pytest.raises(ValueError, match="client"):
-        collection.pipeline()
-
-
 @mock.patch("google.cloud.firestore_v1.collection.Watch", autospec=True)
 def test_on_snapshot(watch):
     collection = _make_collection_reference("collection")