diff --git a/VERSION b/VERSION index 33df070a..aca2278d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-16 15:38:27) stable +Version 2.0.9 (2012-09-16 15:51:47) stable diff --git a/gluon/dal.py b/gluon/dal.py index cb8bfb50..754e800c 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1457,6 +1457,8 @@ class BaseAdapter(ConnectionPool): having = args_get('having', False) limitby = args_get('limitby', False) for_update = args_get('for_update', False) + if not distinct in (True,False) and not groupby: + distinct, groupby = False, distinct if self.can_select_for_update is False and for_update is True: raise SyntaxError, 'invalid select attribute: for_update' if distinct is True: