From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 4 May 2016 19:53:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/pr/269'
X-Git-Tag: rel_1_1_0b1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1920d2713fc43cfa7089e7bd5592908e90fd69b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge remote-tracking branch 'origin/pr/269'
---

f1920d2713fc43cfa7089e7bd5592908e90fd69b
diff --cc doc/build/orm/composites.rst
index ef4ea8954b,d2f42f6f62..b18cedb31e
--- a/doc/build/orm/composites.rst
+++ b/doc/build/orm/composites.rst
@@@ -87,17 -87,17 +87,17 @@@ using the ``.start`` and ``.end`` attri
      >>> v = Vertex(start=Point(3, 4), end=Point(5, 6))
      >>> session.add(v)
      >>> q = session.query(Vertex).filter(Vertex.start == Point(3, 4))
 -    {sql}>>> print q.first().start
 +    {sql}>>> print(q.first().start)
      BEGIN (implicit)
-     INSERT INTO vertice (x1, y1, x2, y2) VALUES (?, ?, ?, ?)
+     INSERT INTO vertices (x1, y1, x2, y2) VALUES (?, ?, ?, ?)
      (3, 4, 5, 6)
-     SELECT vertice.id AS vertice_id,
-             vertice.x1 AS vertice_x1,
-             vertice.y1 AS vertice_y1,
-             vertice.x2 AS vertice_x2,
-             vertice.y2 AS vertice_y2
-     FROM vertice
-     WHERE vertice.x1 = ? AND vertice.y1 = ?
+     SELECT vertices.id AS vertices_id,
+             vertices.x1 AS vertices_x1,
+             vertices.y1 AS vertices_y1,
+             vertices.x2 AS vertices_x2,
+             vertices.y2 AS vertices_y2
+     FROM vertices
+     WHERE vertices.x1 = ? AND vertices.y1 = ?
       LIMIT ? OFFSET ?
      (3, 4, 1, 0)
      {stop}Point(x=3, y=4)