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

fixed issue 1587:Mongodb error on id

Browse Source
This commit is contained in:
mdipierro
2013-07-17 07:37:38 -05:00
parent cd14782641
commit 63ca73d6f0
3 changed files with 4 additions and 3 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.16.13.14.21 Version 2.6.0-development+timestamp.2013.07.17.07.36.50
gluon/dal.py
+2 -1
View File
@@ -5540,8 +5540,9 @@ class MongoDBAdapter(NoSQLAdapter):
filter = None filter = None
if query: if query:
filter = self.expand(query) filter = self.expand(query)
# do not try to update id fields to avoid backend errors
modify = {'$set': dict((k.name, self.represent(v, k.type)) for modify = {'$set': dict((k.name, self.represent(v, k.type)) for
k, v in fields)} k, v in fields if (not k.name in ("_id", "id")))}
return modify, filter return modify, filter
def update(self, tablename, query, fields, safe=None): def update(self, tablename, query, fields, safe=None):
gluon/utils.py
+1 -1
View File
@@ -80,7 +80,7 @@ def compare(a, b):
def md5_hash(text): def md5_hash(text):
""" Generate a md5 hash with the given text """ """ Generate a md5 hash with the given text """
return md5(text).hexdigest() return md5.new(text).hexdigest()
def simple_hash(text, key='', salt='', digest_alg='md5'): def simple_hash(text, key='', salt='', digest_alg='md5'):