fixed issue 1342:MySQL, self-reference, and null values

2013-09-01 13:12:30 -05:00
parent b7f46c969f
commit ca85afeb2f
2 changed files with 4 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.01.12.42.52
+Version 2.6.0-development+timestamp.2013.09.01.13.11.38
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6943,9 +6943,11 @@ def sqlhtml_validators(field):
                                           referenced._format,multiple=True)
        else:
            requires = validators.IS_IN_DB(db,referenced._id,
-                                           multiple=True)
+                                           multiple=True)        
        if field.unique:
            requires._and = validators.IS_NOT_IN_DB(db,field)
+        if not field.notnull:
+            requires = validators.IS_EMPTY_OR(requires)
        return requires
    elif field_type.startswith('list:'):
        def repr_list(values,row=None): return', '.join(str(v) for v in (values or []))