From: Lele Gaifax <lele@metapensiero.it>
Date: Wed, 15 Nov 2017 23:11:05 +0000 (-0500)
Subject: add nullsfirst() / nullslast() to top-level imports
X-Git-Tag: rel_1_1_16~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be8f9597b0ba29adad7cd180b39cf43d61e0a35;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

add nullsfirst() / nullslast() to top-level imports

Change-Id: Ieefcc4c30c1c17f43f2908d961e00815bae862bb
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/378
(cherry picked from commit d507ea00a9523cf5dc00a7c663ed4a44d1fdddcf)
---

diff --git a/doc/build/changelog/unreleased_11/nulls_import.rst b/doc/build/changelog/unreleased_11/nulls_import.rst
new file mode 100644
index 0000000000..c501b22f41
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/nulls_import.rst
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, sql
+    :versions: 1.2.0b4
+
+    Added :func:`.nullsfirst` and :func:`.nullslast` as top level imports
+    in the ``sqlalchemy.`` and ``sqlalchemy.sql.`` namespace.  Pull request
+    courtesy Lele Gaifax.
\ No newline at end of file
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index bf5918ce85..97abfc770f 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -38,6 +38,8 @@ from .sql import (
     modifier,
     not_,
     null,
+    nullsfirst,
+    nullslast,
     or_,
     outerjoin,
     outparam,
diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py
index 5eebd7d1c0..22501ad012 100644
--- a/lib/sqlalchemy/sql/__init__.py
+++ b/lib/sqlalchemy/sql/__init__.py
@@ -53,6 +53,8 @@ from .expression import (
     modifier,
     not_,
     null,
+    nullsfirst,
+    nullslast,
     or_,
     outerjoin,
     outparam,