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

Merge pull request #144 from michele-comitini/dal_sum_expression_fix

Browse Source 
changed way to detect missing key since None is already a possible value
This commit is contained in:
mdipierro
2013-07-21 14:53:26 -07:00
parent 41c3f6a0b4 a208e8cc9f
commit 5ce5b5672b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+2 -2
View File
@@ -6876,8 +6876,8 @@ class Row(object):
key=str(k) key=str(k)
_extra = self.__dict__.get('_extra', None) _extra = self.__dict__.get('_extra', None)
if _extra is not None: if _extra is not None:
v = _extra.get(key, None) v = _extra.get(key, r'[__+-+_key_not_found_+-+__]')
if v is not None: if v != r'[__+-+_key_not_found_+-+__]':
return v return v
m = REGEX_TABLE_DOT_FIELD.match(key) m = REGEX_TABLE_DOT_FIELD.match(key)
if m: if m:
gluon/tests/test_dal.py
+4
View File
@@ -387,6 +387,10 @@ class TestExpressions(unittest.TestCase):
self.assertEqual(db.tt.insert(aa=3), 3) self.assertEqual(db.tt.insert(aa=3), 3)
self.assertEqual(db(db.tt.aa == 3).update(aa=db.tt.aa + 1), 1) self.assertEqual(db(db.tt.aa == 3).update(aa=db.tt.aa + 1), 1)
self.assertEqual(db(db.tt.aa == 4).count(), 1) self.assertEqual(db(db.tt.aa == 4).count(), 1)
self.assertEqual(db(db.tt.aa == -2).count(), 0)
sum = (db.tt.aa + 1).sum()
self.assertEqual(db(db.tt.aa == 2).select(sum).first()[sum], 3)
self.assertEqual(db(db.tt.aa == -2).select(sum).first()[sum], None)
db.tt.drop() db.tt.drop()