summaryrefslogtreecommitdiff
path: root/doc/build/orm/tutorial.rst
diff options
context:
space:
mode:
authorKataev Denis <kataev@skydns.ru>2017-05-22 17:52:45 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-05-22 17:53:09 -0400
commit42b6ef8ccd691f6ace30ae16ed70f92e748f763f (patch)
tree04224f624e91ece3e2d8dde2564414068f33e6e5 /doc/build/orm/tutorial.rst
parent990d4c799f2a48530616e289418af395d168b56c (diff)
downloadsqlalchemy-42b6ef8ccd691f6ace30ae16ed70f92e748f763f.tar.gz
Repair formatting throughout documentation
1. Section decorators to [one style](http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#sections): without inset at both side and with same length as text. 2. Fix broken [reference](http://docs.sqlalchemy.org/en/latest/core/type_basics.html#generic-types). 3. Convert tabs to space in some small files. 4. Some python code snippets have python+sql syntax hint. Change-Id: I39a7a41ef0b0591c6bf1e610748e2b5c19fc5379 Pull-request: https://github.com/zzzeek/sqlalchemy/pull/361
Diffstat (limited to 'doc/build/orm/tutorial.rst')
-rw-r--r--doc/build/orm/tutorial.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index afe097e85..f742151b0 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -1111,7 +1111,7 @@ implies a basic one to many association from the ``users`` to a new
table which stores email addresses, which we will call ``addresses``. Using
declarative, we define this table along with its mapped class, ``Address``:
-.. sourcecode:: python+sql
+.. sourcecode:: python
>>> from sqlalchemy import ForeignKey
>>> from sqlalchemy.orm import relationship
@@ -1217,7 +1217,7 @@ already been created:
COMMIT
Working with Related Objects
-=============================
+============================
Now when we create a ``User``, a blank ``addresses`` collection will be
present. Various collection types, such as sets and dictionaries, are possible
@@ -1309,7 +1309,7 @@ to optimize the loading of this collection in a bit.
.. _ormtutorial_joins:
Querying with Joins
-====================
+===================
Now that we have two tables, we can show some more features of :class:`.Query`,
specifically how to create queries that deal with both tables at the same time.
@@ -1691,7 +1691,7 @@ very easy to use:
ensure correct results. See :ref:`subqueryload_ordering`.
Joined Load
--------------
+-----------
The other automatic eager loading function is more well known and is called
:func:`.orm.joinedload`. This style of loading emits a JOIN, by default
@@ -1750,7 +1750,7 @@ for both the lead and the related object.
a detailed description of how this is used.
Explicit Join + Eagerload
---------------------------
+-------------------------
A third style of eager loading is when we are constructing a JOIN explicitly in
order to locate the primary rows, and would like to additionally apply the extra