openstack/deb-python-cassandra-driver
Code Issues Proposed changes

tentative fix for cqlengine tracking issues

Browse Source
This commit is contained in:
Alan Boudreault
2017-03-30 15:47:27 -04:00
parent bbebb5a04b
commit 8bc8c54b43
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cassandra/cqlengine/columns.py
View File

@@ -47,7 +47,7 @@ class BaseValueManager(object):
:rtype: boolean
"""
return self.value != self.previous_value
return self.explicit and self.value != self.previous_value
def reset_previous_value(self):
self.previous_value = deepcopy(self.value)
@@ -57,6 +57,7 @@ class BaseValueManager(object):
def setval(self, val):
self.value = val
self.explicit = True
def delval(self):
self.value = None

11
cassandra/cqlengine/models.py
View File

@@ -407,8 +407,6 @@ class BaseModel(object):
value = column.to_python(value)
value_mngr = column.value_manager(self, column, value)
value_mngr.explicit = name in values
if not value_mngr.explicit and column.has_default:
value_mngr.previous_value = value
self._values[name] = value_mngr
def __repr__(self):
@@ -490,7 +488,8 @@ class BaseModel(object):
return instance
def _set_persisted(self):
for v in self._values.values():
# ensure we don't modify to any values not affected by the last save/update
for v in [v for v in self._values.values() if v.changed]:
v.reset_previous_value()
v.explicit = False
self._is_persisted = True
@@ -591,6 +590,10 @@ class BaseModel(object):
return cls._table_name
def _set_column_value(self, name, value):
"""Function to change a column value without changing then value manager states"""
self._values[name].value = value # internal assignement, skip the main setter
def validate(self):
"""
Cleans and validates the field values
@@ -600,7 +603,7 @@ class BaseModel(object):
if v is None and not self._values[name].explicit and col.has_default:
v = col.get_default()
val = col.validate(v)
setattr(self, name, val)
self._set_column_value(name, val)
# Let an instance be used like a dict of its columns keys/values
def __iter__(self):