From 60d0812f774bfc94ef20542bc0b1fbe0bcae66e2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 22 Jul 2013 04:48:53 -0500 Subject: [PATCH] fixed issue 1596:Alias don't work with record versioning --- VERSION | 2 +- gluon/dal.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index d919b3d3..ace6c9b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.22.04.09.52 +Version 2.6.0-development+timestamp.2013.07.22.04.48.04 diff --git a/gluon/dal.py b/gluon/dal.py index 515ea300..c49c847e 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8320,12 +8320,13 @@ class Table(object): archive_name = '%(tablename)s_archive', current_record = 'current_record', is_active = 'is_active'): - archive_db = archive_db or self._db + db = self._db + archive_db = archive_db or db archive_name = archive_name % dict(tablename=self._tablename) if archive_name in archive_db.tables(): return # do not try define the archive if already exists fieldnames = self.fields() - same_db = archive_db is self._db + same_db = archive_db is db field_type = self if same_db else 'bigint' clones = [] for field in self: @@ -8340,7 +8341,10 @@ class Table(object): if is_active and is_active in fieldnames: self._before_delete.append( lambda qset: qset.update(is_active=False)) - newquery = lambda query, t=self: t.is_active == True + newquery = lambda query, t=self: \ + reduce(AND,[db[tn].is_active == True + for tn in db._adapter.tables(query) + if tn==t.name or getattr(db[tn],'_ot',None)==t.name]) query = self._common_filter if query: newquery = query & newquery