summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorJack Zhou <univerio@gmail.com>2016-05-31 10:01:46 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-06-02 17:46:16 -0400
commite8f97c9e357ed0793ce11086823f83aa4a8bb4ad (patch)
treee87b5fbd22799b56ab771197fd4658afddd08c91 /lib/sqlalchemy/orm/query.py
parenteb28ebb0f8a48ba57f68f21d64479b56bf689d24 (diff)
downloadsqlalchemy-e8f97c9e357ed0793ce11086823f83aa4a8bb4ad.tar.gz
Add SKIP LOCKED support for Postgresql, Oracle
This adds `SELECT ... FOR UPDATE SKIP LOCKED`/ `SELECT ... FOR SHARE SKIP LOCKED` rendering. Change-Id: Id1dc4f1cafc1de23f397a6f73d54ab2c58d5910d Pull-request: https://bitbucket.org/zzzeek/sqlalchemy/pull-requests/86
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 34daa707f..7fab33197 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1397,7 +1397,8 @@ class Query(object):
self._for_update_arg = LockmodeArg.parse_legacy_query(mode)
@_generative()
- def with_for_update(self, read=False, nowait=False, of=None):
+ def with_for_update(self, read=False, nowait=False, of=None,
+ skip_locked=False):
"""return a new :class:`.Query` with the specified options for the
``FOR UPDATE`` clause.
@@ -1425,7 +1426,8 @@ class Query(object):
full argument and behavioral description.
"""
- self._for_update_arg = LockmodeArg(read=read, nowait=nowait, of=of)
+ self._for_update_arg = LockmodeArg(read=read, nowait=nowait, of=of,
+ skip_locked=skip_locked)
@_generative()
def params(self, *args, **kwargs):