From: Mike Bayer Date: Fri, 14 Nov 2008 22:11:05 +0000 (+0000) Subject: - bump, this may become 0.5.0 X-Git-Tag: rel_0_5_0~169 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ff2b7826876dfadc1ce11e8b15a3cb6ac5d289f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - bump, this may become 0.5.0 - Calling alias.execute() in conjunction with server_side_cursors won't raise AttributeError. --- diff --git a/CHANGES b/CHANGES index 6264610323..fa95094db8 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,13 @@ ======= CHANGES ======= +0.5.0rc5 +======== +- bugfixes +- postgres + - Calling alias.execute() in conjunction with + server_side_cursors won't raise AttributeError. + 0.5.0rc4 ======== - features diff --git a/VERSION b/VERSION index c1c884879b..6940c75d48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.0rc4 +0.5.0rc5 diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index 69fad230dd..57620c007c 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -235,7 +235,8 @@ class PGExecutionContext(default.DefaultExecutionContext): # TODO: coverage for server side cursors + select.for_update() is_server_side = \ self.dialect.server_side_cursors and \ - ((self.compiled and isinstance(self.compiled.statement, expression.Selectable) and not self.compiled.statement.for_update) \ + ((self.compiled and isinstance(self.compiled.statement, expression.Selectable) + and not getattr(self.compiled.statement, 'for_update', False)) \ or \ ( (not self.compiled or isinstance(self.compiled.statement, expression._TextClause))