From: Thierry Parmentelat Date: Mon, 20 Nov 2006 10:06:36 +0000 (+0000) Subject: reverting deleted->is_deleted X-Git-Tag: pycurl-7_13_1~277 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c52399403d9a9c76b21fa343d88f3f5e92b0a62d;p=plcapi.git reverting deleted->is_deleted --- diff --git a/PLC/ForeignSlices.py b/PLC/ForeignSlices.py index c0372ab2..317b0366 100644 --- a/PLC/ForeignSlices.py +++ b/PLC/ForeignSlices.py @@ -81,7 +81,7 @@ class ForeignSlice (Row) : Delete existing foreign slice. """ self.purge_peer_slice() - self['deleted']=True + self['is_deleted']=True self.sync(commit) @@ -91,7 +91,7 @@ class ForeignSlices (Table): sql = "" sql += "SELECT %s FROM view_foreign_slices " % ", ".join(self.columns) - sql += "WHERE deleted IS False " + sql += "WHERE is_deleted IS False " if foreign_slice_filter is not None: if isinstance(foreign_slice_filter, (list, tuple, set)): diff --git a/PLC/Slices.py b/PLC/Slices.py index 2707a89b..42da1d4c 100644 --- a/PLC/Slices.py +++ b/PLC/Slices.py @@ -203,7 +203,7 @@ class Slice(Row): (table, self['slice_id']), self) # Mark as deleted - self['deleted'] = True + self['is_deleted'] = True self.sync(commit) class Slices(Table): @@ -215,7 +215,7 @@ class Slices(Table): def __init__(self, api, slice_filter = None, columns = None, expires = int(time.time())): Table.__init__(self, api, Slice, columns) - sql = "SELECT %s FROM view_slices WHERE deleted IS False" % \ + sql = "SELECT %s FROM view_slices WHERE is_deleted IS False" % \ ", ".join(self.columns) if expires is not None: