dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1596:Alias don't work with record versioning

Browse Source
This commit is contained in:
mdipierro
2013-07-22 04:48:53 -05:00
parent b192634946
commit 60d0812f77
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
gluon/dal.py
+7 -3
View File
@@ -8320,12 +8320,13 @@ class Table(object):
archive_name = '%(tablename)s_archive', archive_name = '%(tablename)s_archive',
current_record = 'current_record', current_record = 'current_record',
is_active = 'is_active'): 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) archive_name = archive_name % dict(tablename=self._tablename)
if archive_name in archive_db.tables(): if archive_name in archive_db.tables():
return # do not try define the archive if already exists return # do not try define the archive if already exists
fieldnames = self.fields() fieldnames = self.fields()
same_db = archive_db is self._db same_db = archive_db is db
field_type = self if same_db else 'bigint' field_type = self if same_db else 'bigint'
clones = [] clones = []
for field in self: for field in self:
@@ -8340,7 +8341,10 @@ class Table(object):
if is_active and is_active in fieldnames: if is_active and is_active in fieldnames:
self._before_delete.append( self._before_delete.append(
lambda qset: qset.update(is_active=False)) 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 query = self._common_filter
if query: if query:
newquery = query & newquery newquery = query & newquery