Skip to content

Avoid unexpected evaluation of falsy values when decoding from datastore #37

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

Open
flashsturz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid unexpected evaluation of falsy values when decoding from datastore #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions firebase/firestore/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,32 +70,33 @@ def _decode_datastore(value):
:raises TypeError: For value types that are unsupported.
"""

if value.get('nullValue', False) is None:
if 'nullValue' in value:
return value['nullValue']

elif value.get('booleanValue') is not None:
elif 'booleanValue' in value:
return bool(value['booleanValue'])

elif value.get('bytesValue'):
elif 'bytesValue' in value:
return b64decode(value['bytesValue'].encode('utf-8'))

elif value.get('integerValue'):
elif 'integerValue' in value:
return int(value['integerValue'])

elif value.get('doubleValue'):
elif 'doubleValue' in value:
return float(value['doubleValue'])

elif isinstance(value.get('stringValue'), str):
return str(value['stringValue'])
elif 'stringValue' in value and isinstance(value['stringValue'], str):
return value['stringValue']

elif value.get('mapValue'):
elif 'mapValue' in value:
return _from_datastore(value['mapValue'])

elif value.get('timestampValue'):
elif 'timestampValue' in value:
return DatetimeWithNanoseconds.from_rfc3339(value['timestampValue'])

elif value.get('geoPointValue'):
return GeoPoint(float(value['timestampValue']['latitude']), float(value['timestampValue']['longitude']))
elif 'geoPointValue' in value:
geo = value['geoPointValue']
return GeoPoint(float(geo['latitude']), float(geo['longitude']))

else:
raise TypeError("Cannot convert to a Python Value", value, "Invalid type", type(value))
Expand Down