diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-23 11:20:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-23 11:20:27 -0400 |
| commit | 48c6eb3f9f2bafd6db34b404df27242835b4f8dd (patch) | |
| tree | a99767bc16cc9a5bf9481be42859de083fd84742 /lib/sqlalchemy/dialects/postgresql | |
| parent | 0932e16cb7375a1d9f70b3c35cfe33a2835fa85a (diff) | |
| parent | 81959af6d37be503a13ce9c53317d443e14ae570 (diff) | |
| download | sqlalchemy-48c6eb3f9f2bafd6db34b404df27242835b4f8dd.tar.gz | |
Merge branch 'ticket_3034'
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index bcbf0b12c..e2accfedb 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1161,12 +1161,12 @@ class PGCompiler(compiler.SQLCompiler): def limit_clause(self, select): text = "" - if select._limit is not None: - text += " \n LIMIT " + self.process(sql.literal(select._limit)) - if select._offset is not None: - if select._limit is None: + if select._limit_clause is not None: + text += " \n LIMIT " + self.process(select._limit_clause) + if select._offset_clause is not None: + if select._limit_clause is None: text += " \n LIMIT ALL" - text += " OFFSET " + self.process(sql.literal(select._offset)) + text += " OFFSET " + self.process(select._offset_clause) return text def format_from_hint_text(self, sqltext, table, hint, iscrud): |