summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2016-06-03 10:56:06 -0400
committerGerrit Code Review <gerrit2@ln3.zzzcomputing.com>2016-06-03 10:56:06 -0400
commita6817579cee4fb2569d961b611a4190f3f9fb7ee (patch)
treea0655fc134d4e2e0e5d479ed4649fd9b02935dd9 /lib/sqlalchemy/dialects
parent40f9bcf1112bf25fd87a45cbf08f64c305d055a1 (diff)
parente8f97c9e357ed0793ce11086823f83aa4a8bb4ad (diff)
downloadsqlalchemy-a6817579cee4fb2569d961b611a4190f3f9fb7ee.tar.gz
Merge "Add SKIP LOCKED support for Postgresql, Oracle"
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 6992670c4..493bf362f 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -814,6 +814,8 @@ class OracleCompiler(compiler.SQLCompiler):
if select._for_update_arg.nowait:
tmp += " NOWAIT"
+ if select._for_update_arg.skip_locked:
+ tmp += " SKIP LOCKED"
return tmp
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 136cb1b28..1bc4409f2 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1185,6 +1185,8 @@ class PGCompiler(compiler.SQLCompiler):
if select._for_update_arg.nowait:
tmp += " NOWAIT"
+ if select._for_update_arg.skip_locked:
+ tmp += " SKIP LOCKED"
return tmp