From 305e7906b968c9db145eca7898edfb7ca4f248dc Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:29:55 -0500 Subject: [PATCH] reverted 4077 because distinct on and groupby are not equivalent. Moreover distinct on is supported only by postgresql because potentially non-deterministic and should be discouraged. Thanks Alexander --- VERSION | 2 +- gluon/dal.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 43cdc7da..2c33c26b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:23:39) stable +Version 2.0.9 (2012-09-21 22:29:49) stable diff --git a/gluon/dal.py b/gluon/dal.py index 857bcf84..4e5c5226 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1457,8 +1457,6 @@ class BaseAdapter(ConnectionPool): having = args_get('having', False) limitby = args_get('limitby', False) for_update = args_get('for_update', False) - if not distinct is True and not distinct is 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: