diff options
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 15319e049..f19ec5673 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -642,8 +642,6 @@ class Query(Generative): """Return the full SELECT statement represented by this :class:`.Query`, converted to a scalar subquery. - Analogous to :meth:`sqlalchemy.sql.expression.SelectBase.as_scalar`. - """ return self.scalar_subquery() @@ -1477,18 +1475,15 @@ class Query(Generative): for c in column: _ColumnEntity(self, c) - @util.pending_deprecation( - "0.7", - ":meth:`.add_column` is superseded " "by :meth:`.add_columns`", - False, + @util.deprecated( + "1.4", + ":meth:`.Query.add_column` is deprecated and will be removed in a " + "future release. Please use :meth:`.Query.add_columns`", ) def add_column(self, column): """Add a column expression to the list of result columns to be returned. - Pending deprecation: :meth:`.add_column` will be superseded by - :meth:`.add_columns`. - """ return self.add_columns(column) |