Merge pull request #145 from michele-comitini/postgresql_json_bug

bugfix native json fields were not supported correcly
This commit is contained in:
mdipierro
2013-07-21 14:51:12 -07:00
2 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -6781,7 +6781,7 @@ def sqlhtml_validators(field):
if field_type in (('string', 'text', 'password')):
requires.append(validators.IS_LENGTH(field_length))
elif field_type == 'json':
requires.append(validators.IS_EMPTY_OR(validators.IS_JSON()))
requires.append(validators.IS_EMPTY_OR(validators.IS_JSON(native_json=field.db._adapter.native_json)))
elif field_type == 'double' or field_type == 'float':
requires.append(validators.IS_FLOAT_IN_RANGE(-1e100, 1e100))
elif field_type in ('integer','bigint'):
+5 -1
View File
@@ -346,13 +346,17 @@ class IS_JSON(Validator):
('spam1234', 'invalid json')
"""
def __init__(self, error_message='invalid json'):
def __init__(self, error_message='invalid json', native_json=False):
self.native_json = native_json
self.error_message = error_message
def __call__(self, value):
if value is None:
return None
try:
if self.native_json:
simplejson.dumps(value) # raises error in case of malformed json
return (value, None) # the serialized value is not passed
return (simplejson.loads(value), None)
except JSONErrors:
return (value, translate(self.error_message))