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

fixed problem with multiple uris and lazy tables

Browse Source
This commit is contained in:
mdipierro
2013-11-11 10:16:38 -06:00
parent 833694229d
commit fb9ad028f8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.11.09.39.55 Version 2.7.4-stable+timestamp.2013.11.11.10.15.42
gluon/dal.py
+7 -8
View File
@@ -7588,13 +7588,12 @@ class DAL(object):
for db in db_group: for db in db_group:
if not db._uri: if not db._uri:
continue continue
k = hide_password(db._uri) k = hide_password(db._adapter.uri)
infos[k] = dict(dbstats = [(row[0], row[1]) for row in db._timings], infos[k] = dict(
dbtables = {'defined': dbstats = [(row[0], row[1]) for row in db._timings],
sorted(list(set(db.tables) - dbtables = {'defined': sorted(
set(db._LAZY_TABLES.keys()))), list(set(db.tables)-set(db._LAZY_TABLES.keys()))),
'lazy': sorted(db._LAZY_TABLES.keys())} 'lazy': sorted(db._LAZY_TABLES.keys())})
)
return infos return infos
@staticmethod @staticmethod
@@ -8248,7 +8247,7 @@ def index():
def __repr__(self): def __repr__(self):
if hasattr(self,'_uri'): if hasattr(self,'_uri'):
return '<DAL uri="%s">' % hide_password(str(self._uri)) return '<DAL uri="%s">' % hide_password(self._adapter.uri)
else: else:
return '<DAL db_uid="%s">' % self._db_uid return '<DAL db_uid="%s">' % self._db_uid