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

fixed memdb(Client()) problem

Browse Source
This commit is contained in:
mdipierro
2013-08-27 18:20:25 -05:00
committed by Michele Comitini
parent 4d46477bee
commit 5ebf93e453
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.27.18.01.56
Version 2.6.0-development+timestamp.2013.08.27.18.19.31

13
gluon/globals.py
View File

@@ -908,12 +908,10 @@ class Session(Storage):
new_unique_key = web2py_uuid()
row = table(record_id)
if row and row.unique_key==unique_key:
row.update_record(unique_key=new_unique_key)
table._db(table.id==record_id).update(unique_key=new_unique_key)
else:
row = None
else:
row = None
if row:
record_id = None
if record_id:
response.session_id = '%s:%s' % (record_id, unique_key)
response.session_db_record_id = record_id
response.session_db_unique_key = new_unique_key
@@ -1028,10 +1026,7 @@ class Session(Storage):
session_data=cPickle.dumps(dict(self)),
unique_key=unique_key)
if record_id:
row = table(record_id)
if row:
row.update_record(**dd)
else:
if not table._db(table.id==record_id).update(**dd):
record_id = None
if not record_id:
record_id = table.insert(**dd)