diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/operators.py | 16 |
7 files changed, 20 insertions, 16 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index 3deb437bb..f02e79f33 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -122,7 +122,7 @@ def create_engine(*args, **kwargs): See also: - :ref:`engines_toplevel` + :doc:`/core/engines` :ref:`connections_toplevel` diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index bf664413c..797158b3b 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1292,7 +1292,7 @@ class Engine(Connectable, log.Identified): See also: - :ref:`engines_toplevel` + :doc:`/core/engines` :ref:`connections_toplevel` diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index 8c98ee3e4..ea8e5a36e 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -170,9 +170,6 @@ def create_session(bind=None, **kwargs): def relationship(argument, secondary=None, **kwargs): """Provide a relationship of a primary Mapper to a secondary Mapper. - .. versionchanged:: 0.6 - :func:`relationship` is historically known as :func:`relation`. - This corresponds to a parent-child or associative table relationship. The constructed class is an instance of :class:`.RelationshipProperty`. @@ -450,7 +447,7 @@ def relationship(argument, secondary=None, **kwargs): * None - a synonym for 'noload' - Detailed discussion of loader strategies is at :ref:`loading_toplevel`. + Detailed discussion of loader strategies is at :doc:`/orm/loading`. :param load_on_pending=False: Indicates loading behavior for transient or pending parent objects. @@ -625,6 +622,9 @@ def relationship(argument, secondary=None, **kwargs): not compile into eager or lazy loaders properly. If this is the case, use an alternative method. + .. versionchanged:: 0.6 + :func:`relationship` was renamed from its previous name :func:`relation`. + """ return RelationshipProperty(argument, secondary=secondary, **kwargs) diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 9289c01e1..b129685a2 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -747,7 +747,7 @@ class Query(object): foreign-key-to-primary-key criterion, will also use an operation equivalent to :meth:`~.Query.get` in order to retrieve the target value from the local identity map - before querying the database. See :ref:`loading_toplevel` + before querying the database. See :doc:`/orm/loading` for further details on relationship loading. :param ident: A scalar or tuple value representing @@ -1039,7 +1039,7 @@ class Query(object): Most supplied options regard changing how column- and relationship-mapped attributes are loaded. See the sections - :ref:`deferred` and :ref:`loading_toplevel` for reference + :ref:`deferred` and :doc:`/orm/loading` for reference documentation. """ diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 70d3bc0bb..15a78b842 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -428,7 +428,7 @@ class SessionTransaction(object): class Session(_SessionClassMethods): """Manages persistence operations for ORM-mapped objects. - The Session's usage paradigm is described at :ref:`session_toplevel`. + The Session's usage paradigm is described at :doc:`/orm/session`. """ diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index cf3238b15..dfa3ef852 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -698,7 +698,7 @@ def with_polymorphic(base, classes, selectable=False, :param base: Base class to be aliased. - :param cls_or_mappers: a single class or mapper, or list of + :param classes: a single class or mapper, or list of class/mappers, which inherit from the base class. Alternatively, it may also be the string ``'*'``, in which case all descending mapped classes will be added to the FROM clause. diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py index 8c5b9b3d5..88f56e5ec 100644 --- a/lib/sqlalchemy/sql/operators.py +++ b/lib/sqlalchemy/sql/operators.py @@ -128,6 +128,10 @@ class Operators(object): .. versionadded:: 0.8 - added the 'precedence' argument. + .. seealso:: + + :ref:`types_operators` + """ operator = custom_op(opstring, precedence) @@ -505,7 +509,7 @@ class ColumnOperators(Operators): def __radd__(self, other): """Implement the ``+`` operator in reverse. - See :meth:`__add__`. + See :meth:`.ColumnOperators.__add__`. """ return self.reverse_operate(add, other) @@ -513,7 +517,7 @@ class ColumnOperators(Operators): def __rsub__(self, other): """Implement the ``-`` operator in reverse. - See :meth:`__sub__`. + See :meth:`.ColumnOperators.__sub__`. """ return self.reverse_operate(sub, other) @@ -521,7 +525,7 @@ class ColumnOperators(Operators): def __rmul__(self, other): """Implement the ``*`` operator in reverse. - See :meth:`__mul__`. + See :meth:`.ColumnOperators.__mul__`. """ return self.reverse_operate(mul, other) @@ -529,7 +533,7 @@ class ColumnOperators(Operators): def __rdiv__(self, other): """Implement the ``/`` operator in reverse. - See :meth:`__div__`. + See :meth:`.ColumnOperators.__div__`. """ return self.reverse_operate(div, other) @@ -550,7 +554,7 @@ class ColumnOperators(Operators): if the parent object has non-string affinity. If the parent object has a string affinity, produces the concatenation operator, ``a || b`` - - see :meth:`concat`. + see :meth:`.ColumnOperators.concat`. """ return self.operate(add, other) @@ -598,7 +602,7 @@ class ColumnOperators(Operators): def __rtruediv__(self, other): """Implement the ``//`` operator in reverse. - See :meth:`__truediv__`. + See :meth:`.ColumnOperators.__truediv__`. """ return self.reverse_operate(truediv, other) |