summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/selectable.py
diff options
context:
space:
mode:
authorVraj Mohan <r.vrajmohan@gmail.com>2013-11-11 15:04:52 -0500
committerVraj Mohan <r.vrajmohan@gmail.com>2013-11-12 20:23:05 -0500
commit631eb841084a50518af90e2e728bd1efd31228f7 (patch)
tree3ecf72cc369486df85aca7d0736e2360e4c7a71c /lib/sqlalchemy/sql/selectable.py
parentf429032ac202a29cb674be461d5fd5fa76a8f0ad (diff)
downloadsqlalchemy-631eb841084a50518af90e2e728bd1efd31228f7.tar.gz
Fix cross references
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
-rw-r--r--lib/sqlalchemy/sql/selectable.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 550e250f1..f83cdf692 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -246,8 +246,8 @@ class FromClause(Selectable):
:param column: the target :class:`.ColumnElement` to be matched
:param require_embedded: only return corresponding columns for
- the given :class:`.ColumnElement`, if the given
- :class:`.ColumnElement` is actually present within a sub-element
+ the given :class:`.ColumnElement`, if the given :class:`.ColumnElement`
+ is actually present within a sub-element
of this :class:`.FromClause`. Normally the column will match if
it merely shares a common ancestor with one of the exported
columns of this :class:`.FromClause`.
@@ -756,7 +756,7 @@ class Join(FromClause):
ON table_b_1.id = table_c_1.b_id
) ON table_a_1.id = table_b_1.a_id
- The standalone :func:`experssion.alias` function as well as the
+ The standalone :func:`~.expression.alias` function as well as the
base :meth:`.FromClause.alias` method also support the ``flat=True``
argument as a no-op, so that the argument can be passed to the
``alias()`` method of any selectable.
@@ -1352,7 +1352,8 @@ class SelectBase(Executable, FromClause):
"'autocommit' flag.")
def autocommit(self):
"""return a new selectable with the 'autocommit' flag set to
- True."""
+ True.
+ """
self._execution_options = \
self._execution_options.union({'autocommit': True})