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

Change-Id: Ieefcc4c30c1c17f43f2908d961e00815bae862bb
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/378

diff --git a/doc/build/changelog/unreleased_11/nulls_import.rst b/doc/build/changelog/unreleased_11/nulls_import.rst
new file mode 100644 (file)
index 0000000..c501b22
--- /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 772f979ccd57b4e07fa2ddd24be41460d4264629..61cec68f447822a8ab3633fad446175d4cae7521 100644 (file)
--- 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 13042ed7a5e173a0ff2b35bba6ffba31b5c4735a..cc28db73a08f448e102addc3b9afb7263e3271c9 100644 (file)
--- 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,