diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-11-17 10:32:29 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2017-11-17 10:32:29 -0500 |
| commit | bb21dea84cd6bc70ab12acb61d1f4511a013f90d (patch) | |
| tree | e669342204eaab10e4ca37144f32a140d1e86e44 | |
| parent | 436beea3a9deab5f3ca39d28902bd94f9342044d (diff) | |
| parent | d507ea00a9523cf5dc00a7c663ed4a44d1fdddcf (diff) | |
| download | sqlalchemy-bb21dea84cd6bc70ab12acb61d1f4511a013f90d.tar.gz | |
Merge "add nullsfirst() / nullslast() to top-level imports"
| -rw-r--r-- | doc/build/changelog/unreleased_11/nulls_import.rst | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/__init__.py | 2 |
3 files changed, 11 insertions, 0 deletions
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 000000000..c501b22f4 --- /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 772f979cc..61cec68f4 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 13042ed7a..cc28db73a 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, |