summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mysql/base.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/dialects/mysql/base.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/dialects/mysql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index eec4d8a48..324ff2d36 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1437,7 +1437,14 @@ class MySQLCompiler(compiler.SQLCompiler):
self.process(join.onclause, **kwargs)))
def for_update_clause(self, select):
- if select.for_update == 'read':
+ # backwards compatibility
+ if isinstance(select.for_update, bool):
+ return ' FOR UPDATE'
+ elif isinstance(select.for_update, str):
+ if select.for_update == 'read':
+ return ' LOCK IN SHARE MODE'
+
+ if select.for_update.mode == 'read':
return ' LOCK IN SHARE MODE'
else:
return super(MySQLCompiler, self).for_update_clause(select)