Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support IN/NOT_IN/NOT_EQUAL operators #5198

Merged
merged 13 commits into from
Jun 13, 2022
Merged

feat: support IN/NOT_IN/NOT_EQUAL operators #5198

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
80e284d
Added new operators and unit tests
vishwarajanand Mar 30, 2022
76fb88c
fix: [PubSub] removing misspelled field, add correctly spelled field …
gcf-owl-bot[bot] Mar 31, 2022
28ae794
fix: [CertificateManager] Updated resource patterns to comply with ht…
gcf-owl-bot[bot] Mar 31, 2022
594a335
feat: [DataprocMetastore] Added DatabaseType field for the type of ba…
gcf-owl-bot[bot] Mar 31, 2022
5c93be3
docs: [Talent] Added functionality in the companyDisplayNames filter …
gcf-owl-bot[bot] Mar 31, 2022
a6707c4
feat: introduce hot tablet/ping and warm RPCs (#5119)
gcf-owl-bot[bot] Mar 31, 2022
bf95626
feat: Add the ability to plumb environment capabilities through v1bet…
gcf-owl-bot[bot] Mar 31, 2022
b4de86b
Merge branch 'main' into datastore_operators
vishwarajanand Apr 5, 2022
3287b4d
Merge branch 'googleapis:main' into datastore_operators
vishwarajanand Apr 22, 2022
aa58185
Merge branch 'googleapis:main' into datastore_operators
vishwarajanand May 25, 2022
3bb58ea
limiting shorthand operators to not equals
vishwarajanand May 25, 2022
4bb8396
Added short operator to filter documentation
vishwarajanand May 26, 2022
b1734f1
Merge branch 'googleapis:main' into datastore_operators
vishwarajanand Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Datastore/src/Query/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ class Query implements QueryInterface
const OP_GREATER_THAN = 'GREATER_THAN';
const OP_GREATER_THAN_OR_EQUAL = 'GREATER_THAN_OR_EQUAL';
const OP_EQUALS = 'EQUAL';
const OP_NOT_EQUALS = 'NOT_EQUAL';
const OP_IN = 'IN';
const OP_NOT_IN = 'NOT_IN';
const OP_HAS_ANCESTOR = 'HAS_ANCESTOR';

const ORDER_DEFAULT = self::ORDER_ASCENDING;
Expand All @@ -99,6 +102,9 @@ class Query implements QueryInterface
self::OP_GREATER_THAN_OR_EQUAL,
self::OP_EQUALS,
self::OP_HAS_ANCESTOR,
self::OP_NOT_EQUALS,
self::OP_IN,
self::OP_NOT_IN,
];

/**
Expand All @@ -109,7 +115,10 @@ class Query implements QueryInterface
'<=' => self::OP_LESS_THAN_OR_EQUAL,
'>' => self::OP_GREATER_THAN,
'>=' => self::OP_GREATER_THAN_OR_EQUAL,
'=' => self::OP_EQUALS
'=' => self::OP_EQUALS,
'!=' => self::OP_NOT_EQUALS,
'IN' => self::OP_IN,
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
'NOT_IN' => self::OP_NOT_IN,
];

/**
Expand Down
27 changes: 27 additions & 0 deletions Datastore/tests/Unit/Query/QueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,33 @@ public function testOperatorConstantsEquals()
$this->assertEquals('EQUAL', $filters[0]['propertyFilter']['op']);
}

public function testOperatorConstantsNotEquals()
{
$this->query->filter('propName', Query::OP_NOT_EQUALS, 'val');
$res = $this->query->queryObject();

$filters = $res['filter']['compositeFilter']['filters'];
$this->assertEquals('NOT_EQUAL', $filters[0]['propertyFilter']['op']);
}

public function testOperatorConstantsIn()
{
$this->query->filter('propName', Query::OP_IN, 'val');
$res = $this->query->queryObject();

$filters = $res['filter']['compositeFilter']['filters'];
$this->assertEquals('IN', $filters[0]['propertyFilter']['op']);
}

public function testOperatorConstantsNotIn()
{
$this->query->filter('propName', Query::OP_NOT_IN, 'val');
$res = $this->query->queryObject();

$filters = $res['filter']['compositeFilter']['filters'];
$this->assertEquals('NOT_IN', $filters[0]['propertyFilter']['op']);
}

public function testOperatorConstantsHasAncestor()
{
$this->query->filter('propName', Query::OP_HAS_ANCESTOR, 'val');
Expand Down