diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-12-25 17:34:24 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-12-25 17:34:24 -0500 |
| commit | 68f6951019dce746a0d093ee597e89d68f4d8fc0 (patch) | |
| tree | 24c6c415aacf75e2a24215626215f7853e0b9469 /lib/sqlalchemy/sql/expression.py | |
| parent | 6ed0d7e3339dd14daad612f9ac6dd2f5e90ef517 (diff) | |
| download | sqlalchemy-68f6951019dce746a0d093ee597e89d68f4d8fc0.tar.gz | |
fix a whole bunch of note:: / warning:: that were inline,
no longer compatible with docutils 0.8
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index c333bb639..268448bc3 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -236,9 +236,11 @@ def select(columns=None, whereclause=None, from_obj=[], **kwargs): ``distinct`` is also available via the :meth:`~.Select.distinct` generative method. - .. note:: The ``distinct`` keyword's acceptance of a string - argument for usage with MySQL is deprecated. Use - the ``prefixes`` argument or :meth:`~.Select.prefix_with`. + .. note:: + + The ``distinct`` keyword's acceptance of a string + argument for usage with MySQL is deprecated. Use + the ``prefixes`` argument or :meth:`~.Select.prefix_with`. :param for_update=False: when ``True``, applies ``FOR UPDATE`` to the end of the @@ -4697,7 +4699,9 @@ class Select(_SelectBase): """Return a new :func:`.select` construct with its columns clause replaced with the given columns. - .. note:: Due to a bug fix, this method has a slight + .. note:: + + Due to a bug fix, this method has a slight behavioral change as of version 0.7.3. Prior to version 0.7.3, the FROM clause of a :func:`.select` was calculated upfront and as new columns |