Skip to content

#88 Support the addition of new fields to an existing schema. #275

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

#88 Support the addition of new fields to an existing schema. #275

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26b34d3
#88 Support the addition of new fields to an existing schema.
JonathanWylie Mar 15, 2016
41dc78f
#88 Support the addition of new fields to an existing schema, by set…
JonathanWylie Mar 16, 2016
505cf34
#88 Handle getting the default value for a field explicitly. Instead…
JonathanWylie Mar 16, 2016
2f2eecd
#88 Python 3 does not have iteritems so just use bog standard items.…
JonathanWylie Mar 16, 2016
9cdf608
#88 Support the addition of new fields to an existing schema.
JonathanWylie Mar 16, 2016
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
Prev Previous commit
Next Next commit
#88 Handle getting the default value for a field explicitly. Instead… 
… of overloading the descriptor __get__ method.

 - The _get_ method should return values in python types, eg a date time is a datetime.datetime instance
 - The default values need to be in basic json types, eg [1,2,3] , {}, str, int which can be serialized to the doc
 - We don't need to get the default values in __get__ anymore because the defaults are set on initialisation of the mapping, or on wrap in a mapping.
  • Loading branch information
@JonathanWylie
JonathanWylie committed Mar 16, 2016
commit 505cf343f6cdca06da69824cdec33b721b55a35f
9 changes: 7 additions & 2 deletions couchdb/mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,11 @@ def __get__(self, instance, owner):
value = instance._data.get(self.name)
if value is not None:
value = self._to_python(value)
elif self.default is not None:
return value

def get_default(self):
value = None
if self.default is not None:
default = self.default
if callable(default):
default = default()
Expand Down Expand Up @@ -139,7 +143,8 @@ def __init__(self, **values):
if attrname in values:
setattr(self, attrname, values.pop(attrname))
else:
setattr(self, attrname, getattr(self, attrname))
field = getattr(self.__class__, attrname)
setattr(self, attrname, field.get_default())

def __iter__(self):
return iter(self._data)
Expand Down