diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-09 00:21:13 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-09 00:21:13 -0500 |
| commit | 2cbf1e590f87df848a42c18aa17e0dfb12443852 (patch) | |
| tree | c1c02a66e30047dd202908a8951983f7fb2c7b56 /lib/sqlalchemy | |
| parent | 1ea2ac12614ebba060dbe177dfd201ae206be088 (diff) | |
| download | sqlalchemy-2cbf1e590f87df848a42c18aa17e0dfb12443852.tar.gz | |
various formatting and hyperlinking fixes
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 609805373..20f71bb51 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1596,8 +1596,6 @@ class Query(object): or a ``text()`` construct, and should return the set of columns appropriate to the entity class represented by this ``Query``. - Also see the ``instances()`` method. - """ if isinstance(statement, basestring): statement = sql.text(statement) diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 99663c9c6..27fa36768 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -1695,6 +1695,8 @@ class _CompareMixin(ColumnOperators): return o[0](self, op, other, reverse=True, *o[1:], **kwargs) def in_(self, other): + """Compare this element to the given element or collection using IN.""" + return self._in_impl(operators.in_op, operators.notin_op, other) def _in_impl(self, op, negate_op, seq_or_selectable): @@ -1793,6 +1795,8 @@ class _CompareMixin(ColumnOperators): def label(self, name): """Produce a column label, i.e. ``<columnname> AS <name>``. + + This is a shortcut to the :func:`~.expression.label` function. if 'name' is None, an anonymous label name will be generated. |
