diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-08-25 15:29:25 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-08-25 15:29:25 -0400 |
| commit | 4baa9041cc97394600ad1eefbed81777dde18a1e (patch) | |
| tree | 8fcae0ec4064c02ef69f137b8f8536ca1fb516cb /lib/sqlalchemy/sql/compiler.py | |
| parent | 887fb3ebaad20847edc752f5fcf072ace947d56a (diff) | |
| parent | 3a5bbe4cbe12d180fba2b942d0467b46be705bea (diff) | |
| download | sqlalchemy-4baa9041cc97394600ad1eefbed81777dde18a1e.tar.gz | |
Merge "Allow for multiple FOLLOWING/PRECEDING in a window range"
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 53009e2df..2dec3a5c3 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -848,16 +848,25 @@ class SQLCompiler(Compiled): cast.typeclause._compiler_dispatch(self, **kwargs)) def _format_frame_clause(self, range_, **kw): + return '%s AND %s' % ( "UNBOUNDED PRECEDING" if range_[0] is elements.RANGE_UNBOUNDED else "CURRENT ROW" if range_[0] is elements.RANGE_CURRENT - else "%s PRECEDING" % (self.process(range_[0], **kw), ), + else "%s PRECEDING" % ( + self.process(elements.literal(abs(range_[0])), **kw), ) + if range_[0] < 0 + else "%s FOLLOWING" % ( + self.process(elements.literal(range_[0]), **kw), ), "UNBOUNDED FOLLOWING" if range_[1] is elements.RANGE_UNBOUNDED else "CURRENT ROW" if range_[1] is elements.RANGE_CURRENT - else "%s FOLLOWING" % (self.process(range_[1], **kw), ) + else "%s PRECEDING" % ( + self.process(elements.literal(abs(range_[1])), **kw), ) + if range_[1] < 0 + else "%s FOLLOWING" % ( + self.process(elements.literal(range_[1]), **kw), ), ) def visit_over(self, over, **kwargs): |