reverted previous change but still problems with concurency multiple dbs in different folders in same app

This commit is contained in:
mdipierro
2012-10-22 22:52:40 -05:00
parent 510e8d70d7
commit 5a63fddf02
2 changed files with 11 additions and 1 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.2.1 (2012-10-22 22:49:31) stable
Version 2.2.1 (2012-10-22 22:52:36) stable
+10
View File
@@ -6625,6 +6625,14 @@ class DAL(object):
db._db_uid = db_uid
return db
@staticmethod
def set_folder(folder):
"""
# ## this allows gluon to set a folder for this thread
# ## <<<<<<<<< Should go away as new DAL replaces old sql.py
"""
BaseAdapter.set_folder(folder)
@staticmethod
def distributed_transaction_begin(*instances):
if not instances:
@@ -6704,6 +6712,8 @@ class DAL(object):
credential_decoder = lambda cred: cred
else:
credential_decoder = lambda cred: urllib.unquote(cred)
if folder:
self.set_folder(folder)
self._uri = uri
self._pool_size = pool_size
self._db_codec = db_codec