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

Jump to bottom

fix: make TimePartitioning repr evaluable #110

Merged
merged 14 commits into from Oct 13, 2020
Merged

fix: make TimePartitioning repr evaluable #110

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1450f4f
fix: Makes TimePartitioning printable representation evaluable
francois-baptiste May 18, 2020
4338280
Merge branch 'master' into patch-1
francois-baptiste May 20, 2020
3486d44
Merge branch 'master' into patch-1
plamut May 25, 2020
73addd0
Remove implicitly concatenated strings
francois-baptiste May 25, 2020
3a250ad
fix: Call repr for non built-in type objects only
francois-baptiste May 25, 2020
e947bdd
TimePartitioning field "field" is now evaluable. Change test accordin…
francois-baptiste May 26, 2020
ab45cba
fix: lint
francois-baptiste May 28, 2020
7839a16
fix: cover issue
francois-baptiste May 28, 2020
479c967
Merge branch 'master' into patch-1
francois-baptiste Jun 8, 2020
bb60581
Merge branch 'master' into patch-1
tseaver Jul 30, 2020
10cadeb
Merge branch 'master' into patch-1
tseaver Aug 4, 2020
d0872bd
Merge branch 'master' into patch-1
tseaver Aug 6, 2020
26d87b6
Merge branch 'master' into patch-1
tswast Oct 6, 2020
6caa53d
Merge branch 'master' into patch-1
tswast Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions google/cloud/bigquery/table.py
View file
Open in desktop
Expand Up @@ -2128,7 +2128,14 @@ def to_api_repr(self):
return self._properties

def _key(self):
return tuple(sorted(self._properties.items()))
properties = self._properties.copy()
francois-baptiste marked this conversation as resolved.
Show resolved Hide resolved
if "type" in properties.keys():
properties["type_"] = properties.pop("type")
francois-baptiste marked this conversation as resolved.
Show resolved Hide resolved
if "requirePartitionFilter" in properties.keys():
properties["require_partition_filter"] = properties.pop("requirePartitionFilter")
if "expirationMs" in properties.keys():
properties["expiration_ms"] = properties.pop("expirationMs")
return tuple(sorted(properties.items()))

def __eq__(self, other):
if not isinstance(other, TimePartitioning):
Expand All @@ -2142,7 +2149,7 @@ def __hash__(self):
return hash(self._key())

def __repr__(self):
key_vals = ["{}={}".format(key, val) for key, val in self._key()]
key_vals = ["{}={}".format(key, repr(val)) for key, val in self._key()]
francois-baptiste marked this conversation as resolved.
Show resolved Hide resolved
return "TimePartitioning({})".format(",".join(key_vals))


Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_table.py
View file
Open in desktop
Expand Up @@ -3743,7 +3743,7 @@ def test___hash__not_equals(self):

def test___repr___minimal(self):
time_partitioning = self._make_one()
expected = "TimePartitioning(type=DAY)"
expected = "TimePartitioning(type_='DAY')"
self.assertEqual(repr(time_partitioning), expected)

def test___repr___explicit(self):
Expand All @@ -3752,7 +3752,7 @@ def test___repr___explicit(self):
time_partitioning = self._make_one(
type_=TimePartitioningType.DAY, field="name", expiration_ms=10000
)
expected = "TimePartitioning(" "expirationMs=10000," "field=name," "type=DAY)"
expected = "TimePartitioning(" "expiration_ms=10000," "field=name," "type_='DAY')"
francois-baptiste marked this conversation as resolved.
Show resolved Hide resolved
self.assertEqual(repr(time_partitioning), expected)

def test_set_expiration_w_none(self):
Expand Down