diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-12-28 16:50:09 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2016-12-28 16:50:09 -0500 |
| commit | a030bc9f171f6692e08eb7604f29e4bc6d51a574 (patch) | |
| tree | 1e55da6680e1dbd60897e0bffa399f308a1ca01f | |
| parent | f0e946993943b609a897e182b52b2fc0ea0939d7 (diff) | |
| parent | 04d799863f710aa3308fcbab63070b719f7e7f81 (diff) | |
| download | sqlalchemy-a030bc9f171f6692e08eb7604f29e4bc6d51a574.tar.gz | |
Merge "Correct any_, all_ spelling"
| -rw-r--r-- | doc/build/changelog/changelog_11.rst | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 0dcc0dd8a..972c1d1df 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -21,6 +21,14 @@ .. changelog:: :version: 1.1.5 + .. change:: 3878 + :tags: bug, sql + :tickets: 3878 + + Fixed 1.1 regression where "import *" would not work for + sqlalchemy.sql.expression, due to mis-spelled "any_" and "all_" + functions. + .. change:: 3877 :tags: bug, oracle, postgresql :tickets: 3877 diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index cbb123ec6..325c222eb 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -15,7 +15,7 @@ class. """ __all__ = [ - 'Alias', 'Any', 'All', 'ClauseElement', 'ColumnCollection', 'ColumnElement', + 'Alias', 'any_', 'all_', 'ClauseElement', 'ColumnCollection', 'ColumnElement', 'CompoundSelect', 'Delete', 'FromClause', 'Insert', 'Join', 'Lateral', 'Select', 'Selectable', 'TableClause', 'Update', 'alias', 'and_', 'asc', 'between', |