diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-09-16 18:45:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-09-16 18:45:51 +0000 |
| commit | d5c89a541f5233baf6b6a7498746820caa7b407f (patch) | |
| tree | 9b3378d1f33da48193d1ea8b8415222c7e80614f /lib/sqlalchemy/sql | |
| parent | 362c9277b2d4d27cbcff359ba29c1e71005fed18 (diff) | |
| parent | 7e864fc7b1b950760cbf02e6dcd5aa5aac267400 (diff) | |
| download | sqlalchemy-d5c89a541f5233baf6b6a7498746820caa7b407f.tar.gz | |
Merge "Create a framework to allow all SQLALCHEMY_WARN_20 to pass"
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/dml.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py index cd4bc17af..fd2efc6f9 100644 --- a/lib/sqlalchemy/sql/dml.py +++ b/lib/sqlalchemy/sql/dml.py @@ -215,7 +215,7 @@ class UpdateBase( "The :paramref:`%(func)s.whereclause` parameter " "will be removed " "in SQLAlchemy 2.0. Please refer to the " - ":meth:`.%(classname)s.where` method." + ":meth:`%(classname)s.where` method." ), values=( "The :paramref:`%(func)s.values` parameter will be removed " @@ -308,8 +308,9 @@ class UpdateBase( def _validate_dialect_kwargs_deprecated(self, dialect_kw): util.warn_deprecated_20( "Passing dialect keyword arguments directly to the " - "constructor is deprecated and will be removed in SQLAlchemy " + "%s constructor is deprecated and will be removed in SQLAlchemy " "2.0. Please use the ``with_dialect_options()`` method." + % (self.__class__.__name__) ) self._validate_dialect_kwargs(dialect_kw) diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 0c808e7a7..6e0ac1fac 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -4612,7 +4612,7 @@ class Select( """ return self.with_only_columns( - util.preloaded.sql_util.reduce_columns( + *util.preloaded.sql_util.reduce_columns( self._exported_columns_iterator(), only_synonyms=only_synonyms, *(self._where_criteria + self._from_obj) |