summaryrefslogtreecommitdiff
path: root/doc
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 /doc
parent40f9bcf1112bf25fd87a45cbf08f64c305d055a1 (diff)
parente8f97c9e357ed0793ce11086823f83aa4a8bb4ad (diff)
downloadsqlalchemy-a6817579cee4fb2569d961b611a4190f3f9fb7ee.tar.gz
Merge "Add SKIP LOCKED support for Postgresql, Oracle"
Diffstat (limited to 'doc')
-rw-r--r--doc/build/changelog/changelog_11.rst10
-rw-r--r--doc/build/changelog/migration_11.rst15
2 files changed, 25 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 40fa46b7c..f58b3e328 100644
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -80,6 +80,16 @@
Alex Grönholm.
.. change::
+ :tags: feature, postgresql, oracle
+ :pullreq: bitbucket:86
+
+ Added new parameter
+ :paramref:`.GenerativeSelect.with_for_update.skip_locked`, which
+ will render the ``SKIP LOCKED`` phrase for a ``FOR UPDATE`` or
+ ``FOR SHARE`` lock on the Postgresql and Oracle backends. Pull
+ request courtesy Jack Zhou.
+
+ .. change::
:tags: change, orm
:tickets: 3394
diff --git a/doc/build/changelog/migration_11.rst b/doc/build/changelog/migration_11.rst
index 7ebaf84a0..90f76fef0 100644
--- a/doc/build/changelog/migration_11.rst
+++ b/doc/build/changelog/migration_11.rst
@@ -2097,6 +2097,14 @@ should be calling upon ``sqlalchemy.dialects.postgresql``.
Engine URLs of the form ``postgres://`` will still continue to function,
however.
+Support for SKIP LOCKED
+-----------------------
+
+The new parameter :paramref:`.GenerativeSelect.with_for_update.skip_locked`
+in both Core and ORM will generate the "SKIP LOCKED" suffix for a
+"SELECT...FOR UPDATE" or "SELECT.. FOR SHARE" query.
+
+
Dialect Improvements and Changes - MySQL
=============================================
@@ -2381,3 +2389,10 @@ on this behavior, set the flag back to True.
Dialect Improvements and Changes - Oracle
=============================================
+
+Support for SKIP LOCKED
+-----------------------
+
+The new parameter :paramref:`.GenerativeSelect.with_for_update.skip_locked`
+in both Core and ORM will generate the "SKIP LOCKED" suffix for a
+"SELECT...FOR UPDATE" or "SELECT.. FOR SHARE" query.