summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-28 11:52:50 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-28 11:52:50 -0500
commit106e793d0573b5bcd1ddee549bca1a546aa13972 (patch)
treeb7a5686e8c47be0fc1988dd184b00286f39ea101 /lib/sqlalchemy/sql/compiler.py
parent33e77c3077a15c51f30ac5aae724c768b9a06911 (diff)
parente9aaf8eb66343f247b1ec2189707f820e20a0629 (diff)
downloadsqlalchemy-106e793d0573b5bcd1ddee549bca1a546aa13972.tar.gz
Merge branch 'for_update_of' of github.com:mlassnig/sqlalchemy into for_update_of
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 59506edea..7725196ff 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1571,7 +1571,12 @@ class SQLCompiler(Compiled):
return ""
def for_update_clause(self, select):
- if select.for_update:
+ # backwards compatibility
+ if isinstance(select.for_update, bool):
+ return " FOR UPDATE" if select.for_update else ""
+ elif isinstance(select.for_update, str):
+ return " FOR UPDATE"
+ elif select.for_update.mode is not None:
return " FOR UPDATE"
else:
return ""