From 77763969ff06b12edcbaedab62890afa27e105b4 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 5 Dec 2010 13:29:34 -0500 Subject: [PATCH] - refer to 0.7 in docs --- doc/build/core/engines.rst | 2 +- doc/build/core/tutorial.rst | 4 ++-- doc/build/intro.rst | 8 ++++---- doc/build/orm/tutorial.rst | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/build/core/engines.rst b/doc/build/core/engines.rst index ac9d392cd2..dbc7dcc451 100644 --- a/doc/build/core/engines.rst +++ b/doc/build/core/engines.rst @@ -43,7 +43,7 @@ SQLAlchemy includes many :class:`~sqlalchemy.engine.base.Dialect` implementation backends; each is described as its own package in the :ref:`sqlalchemy.dialects_toplevel` package. A SQLAlchemy dialect always requires that an appropriate DBAPI driver is installed. -The table below summarizes the state of DBAPI support in SQLAlchemy 0.6. The values +The table below summarizes the state of DBAPI support in SQLAlchemy 0.7. The values translate as: * yes / Python platform - The SQLAlchemy dialect is mostly or fully operational on the target platform. diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst index bf39201981..b7d5ba2726 100644 --- a/doc/build/core/tutorial.rst +++ b/doc/build/core/tutorial.rst @@ -53,13 +53,13 @@ Version Check ============= -A quick check to verify that we are on at least **version 0.6** of SQLAlchemy: +A quick check to verify that we are on at least **version 0.7** of SQLAlchemy: .. sourcecode:: pycon+sql >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest:+SKIP - 0.6.0 + 0.7.0 Connecting ========== diff --git a/doc/build/intro.rst b/doc/build/intro.rst index bf57f8d73a..b679dca3e1 100644 --- a/doc/build/intro.rst +++ b/doc/build/intro.rst @@ -96,15 +96,15 @@ SQLAlchemy is designed to operate with a `DB-API >> import sqlalchemy >>> sqlalchemy.__version__ # doctest: +SKIP - 0.6.0 + 0.7.0 -0.5 to 0.6 Migration +0.6 to 0.7 Migration ===================== -Notes on what's changed from 0.5 to 0.6 is available on the SQLAlchemy wiki at `06Migration `_. +Notes on what's changed from 0.6 to 0.7 is available on the SQLAlchemy wiki at `07Migration `_. diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index de1edd9202..29f6754c44 100644 --- a/doc/build/orm/tutorial.rst +++ b/doc/build/orm/tutorial.rst @@ -45,11 +45,11 @@ following text represents the expected return value. Version Check ============= -A quick check to verify that we are on at least **version 0.6** of SQLAlchemy:: +A quick check to verify that we are on at least **version 0.7** of SQLAlchemy:: >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest:+SKIP - 0.6.0 + 0.7.0 Connecting ========== @@ -737,7 +737,7 @@ Now let's consider a second table to be dealt with. Users in our system also ca The above class introduces a **foreign key** constraint which references the ``users`` table. This defines for SQLAlchemy the relationship between the two tables at the database level. The relationship between the ``User`` and ``Address`` classes is defined separately using the :func:`~sqlalchemy.orm.relationship()` function, which defines an attribute ``user`` to be placed on the ``Address`` class, as well as an ``addresses`` collection to be placed on the ``User`` class. Such a relationship is known as a **bidirectional** relationship. Because of the placement of the foreign key, from ``Address`` to ``User`` it is **many to one**, and from ``User`` to ``Address`` it is **one to many**. SQLAlchemy is automatically aware of many-to-one/one-to-many based on foreign keys. -.. note:: The :func:`~sqlalchemy.orm.relationship()` function has historically been known as :func:`~sqlalchemy.orm.relation()`, which is the name that's available in all versions of SQLAlchemy prior to 0.6beta2, including the 0.5 and 0.4 series. :func:`~sqlalchemy.orm.relationship()` is only available starting with SQLAlchemy 0.6beta2. :func:`~sqlalchemy.orm.relation()` will remain available in SQLAlchemy for the foreseeable future to enable cross-compatibility. +.. note:: The :func:`~sqlalchemy.orm.relationship()` function has historically been known as :func:`~sqlalchemy.orm.relation()` in the 0.5 series of SQLAlchemy and earlier. The :func:`~sqlalchemy.orm.relationship()` function is extremely flexible, and could just have easily been defined on the ``User`` class: -- 2.47.2