Skip to content

Commit 31cf81a

Browse files
kolea2kolea2
authored
samples(datastore): use PropertyFilter in filter samples (GoogleCloudPlatform#11225)
1 parent be9687b commit 31cf81a

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

‎datastore/cloud-client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-datastore==2.15.2
1+
google-cloud-datastore==2.19.0

‎datastore/cloud-client/snippets.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from google.api_core.client_options import ClientOptions
2020
import google.cloud.exceptions
2121
from google.cloud import datastore # noqa: I100
22+
from google.cloud.datastore.query import PropertyFilter
2223

2324

2425
def _preamble():
@@ -385,7 +386,7 @@ def unindexed_property_query(client):
385386

386387
# [START datastore_unindexed_property_query]
387388
query = client.query(kind="Task")
388-
query.add_filter("description", "=", "Learn Cloud Datastore")
389+
query.add_filter(filter=PropertyFilter("description", "=", "Learn Cloud Datastore"))
389390
# [END datastore_unindexed_property_query]
390391

391392
return list(query.fetch())
@@ -397,8 +398,8 @@ def basic_query(client):
397398

398399
# [START datastore_basic_query]
399400
query = client.query(kind="Task")
400-
query.add_filter("done", "=", False)
401-
query.add_filter("priority", ">=", 4)
401+
query.add_filter(filter=PropertyFilter("done", "=", False))
402+
query.add_filter(filter=PropertyFilter("priority", ">=", 4))
402403
query.order = ["-priority"]
403404
# [END datastore_basic_query]
404405

@@ -502,7 +503,7 @@ def property_filter(client):
502503

503504
# [START datastore_property_filter]
504505
query = client.query(kind="Task")
505-
query.add_filter("done", "=", False)
506+
query.add_filter(filter=PropertyFilter("done", "=", False))
506507
# [END datastore_property_filter]
507508

508509
return list(query.fetch())
@@ -514,8 +515,8 @@ def composite_filter(client):
514515

515516
# [START datastore_composite_filter]
516517
query = client.query(kind="Task")
517-
query.add_filter("done", "=", False)
518-
query.add_filter("priority", "=", 4)
518+
query.add_filter(filter=PropertyFilter("done", "=", False))
519+
query.add_filter(filter=PropertyFilter("priority", "=", 4))
519520
# [END datastore_composite_filter]
520521

521522
return list(query.fetch())
@@ -622,8 +623,8 @@ def inequality_range(client):
622623
start_date = datetime.datetime(1990, 1, 1)
623624
end_date = datetime.datetime(2000, 1, 1)
624625
query = client.query(kind="Task")
625-
query.add_filter("created", ">", start_date)
626-
query.add_filter("created", "<", end_date)
626+
query.add_filter(filter=PropertyFilter("created", ">", start_date))
627+
query.add_filter(filter=PropertyFilter("created", "<", end_date))
627628
# [END datastore_inequality_range]
628629

629630
return list(query.fetch())
@@ -634,8 +635,8 @@ def inequality_invalid(client):
634635
# [START datastore_inequality_invalid]
635636
start_date = datetime.datetime(1990, 1, 1)
636637
query = client.query(kind="Task")
637-
query.add_filter("created", ">", start_date)
638-
query.add_filter("priority", ">", 3)
638+
query.add_filter(filter=PropertyFilter("created", ">", start_date))
639+
query.add_filter(filter=PropertyFilter("priority", ">", 3))
639640
# [END datastore_inequality_invalid]
640641

641642
return list(query.fetch())
@@ -649,10 +650,10 @@ def equal_and_inequality_range(client):
649650
start_date = datetime.datetime(1990, 1, 1)
650651
end_date = datetime.datetime(2000, 12, 31, 23, 59, 59)
651652
query = client.query(kind="Task")
652-
query.add_filter("priority", "=", 4)
653-
query.add_filter("done", "=", False)
654-
query.add_filter("created", ">", start_date)
655-
query.add_filter("created", "<", end_date)
653+
query.add_filter(filter=PropertyFilter("priority", "=", 4))
654+
query.add_filter(filter=PropertyFilter("done", "=", False))
655+
query.add_filter(filter=PropertyFilter("created", ">", start_date))
656+
query.add_filter(filter=PropertyFilter("created", "<", end_date))
656657
# [END datastore_equal_and_inequality_range]
657658

658659
return list(query.fetch())
@@ -661,7 +662,7 @@ def equal_and_inequality_range(client):
661662
def inequality_sort(client):
662663
# [START datastore_inequality_sort]
663664
query = client.query(kind="Task")
664-
query.add_filter("priority", ">", 3)
665+
query.add_filter(filter=PropertyFilter("priority", ">", 3))
665666
query.order = ["priority", "created"]
666667
# [END datastore_inequality_sort]
667668

@@ -672,7 +673,7 @@ def inequality_sort_invalid_not_same(client):
672673
try:
673674
# [START datastore_inequality_sort_invalid_not_same]
674675
query = client.query(kind="Task")
675-
query.add_filter("priority", ">", 3)
676+
query.add_filter(filter=PropertyFilter("priority", ">", 3))
676677
query.order = ["created"]
677678
# [END datastore_inequality_sort_invalid_not_same]
678679

@@ -686,7 +687,7 @@ def inequality_sort_invalid_not_first(client):
686687
try:
687688
# [START datastore_inequality_sort_invalid_not_first]
688689
query = client.query(kind="Task")
689-
query.add_filter("priority", ">", 3)
690+
query.add_filter(filter=PropertyFilter("priority", ">", 3))
690691
query.order = ["created", "priority"]
691692
# [END datastore_inequality_sort_invalid_not_first]
692693

@@ -699,8 +700,8 @@ def inequality_sort_invalid_not_first(client):
699700
def array_value_inequality_range(client):
700701
# [START datastore_array_value_inequality_range]
701702
query = client.query(kind="Task")
702-
query.add_filter("tag", ">", "learn")
703-
query.add_filter("tag", "<", "math")
703+
query.add_filter(filter=PropertyFilter("tag", ">", "learn"))
704+
query.add_filter(filter=PropertyFilter("tag", "<", "math"))
704705
# [END datastore_array_value_inequality_range]
705706

706707
return list(query.fetch())
@@ -709,8 +710,8 @@ def array_value_inequality_range(client):
709710
def array_value_equality(client):
710711
# [START datastore_array_value_equality]
711712
query = client.query(kind="Task")
712-
query.add_filter("tag", "=", "fun")
713-
query.add_filter("tag", "=", "programming")
713+
query.add_filter(filter=PropertyFilter("tag", "=", "fun"))
714+
query.add_filter(filter=PropertyFilter("tag", "=", "programming"))
714715
# [END datastore_array_value_equality]
715716

716717
return list(query.fetch())

0 commit comments

Comments
 (0)