From: Mike Bayer Date: Wed, 22 Aug 2007 17:53:01 +0000 (+0000) Subject: - added **modifiers to _get_from_objects X-Git-Tag: rel_0_4beta4~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37b9857f4d97d7555cb291da88f7408fc026a394;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - added **modifiers to _get_from_objects - fixed up PG distinct flag --- diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index 2a4d230cd5..e2876f1f80 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -567,15 +567,14 @@ class PGCompiler(compiler.DefaultCompiler): def get_select_precolumns(self, select): if select._distinct: - if type(select._distinct) == bool: + if isinstance(select._distinct, bool): return "DISTINCT " - if type(select._distinct) == list: - dist_set = "DISTINCT ON (" - for col in select._distinct: - dist_set += self.strings[col] + ", " - dist_set = dist_set[:-2] + ") " - return dist_set - return "DISTINCT ON (" + str(select._distinct) + ") " + elif isinstance(select._distinct, (list, tuple)): + return "DISTINCT ON (" + ', '.join( + [(isinstance(col, basestring) and col or self.process(col)) for col in select._distinct] + )+ ") " + else: + return "DISTINCT ON (" + unicode(select._distinct) + ") " else: return "" diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 41f2b741bb..b31ccbe44e 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2426,7 +2426,7 @@ class Alias(FromClause): yield c yield self.selectable - def _get_from_objects(self): + def _get_from_objects(self, **modifiers): return [self] bind = property(lambda s: s.selectable.bind)