summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/postgres.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-06-17 15:15:16 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-06-17 15:15:16 +0000
commitbe818baf28aac68fbb7934881b4539cb08e9aaa2 (patch)
tree8ecf83d9fe76a3301307900c6378ac6b27e6cef8 /lib/sqlalchemy/databases/postgres.py
parentfd107f2329b760d6bfb2871ed31b2c9dcb4ef922 (diff)
downloadsqlalchemy-be818baf28aac68fbb7934881b4539cb08e9aaa2.tar.gz
merged r4857, postgres server_side_cursors fix, from 0.4 branch
Diffstat (limited to 'lib/sqlalchemy/databases/postgres.py')
-rw-r--r--lib/sqlalchemy/databases/postgres.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 2f4865e96..124242086 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -278,7 +278,10 @@ class PGExecutionContext(default.DefaultExecutionContext):
self.dialect.server_side_cursors and \
((self.compiled and isinstance(self.compiled.statement, expression.Selectable)) \
or \
- (not self.compiled and self.statement and SERVER_SIDE_CURSOR_RE.match(self.statement)))
+ (
+ (not self.compiled or isinstance(self.compiled.statement, expression._TextClause))
+ and self.statement and SERVER_SIDE_CURSOR_RE.match(self.statement))
+ )
if self.__is_server_side:
# use server-side cursors: