diff options
author | Vraj Mohan <r.vrajmohan@gmail.com> | 2013-11-13 15:26:44 -0500 |
---|---|---|
committer | Vraj Mohan <r.vrajmohan@gmail.com> | 2013-11-13 17:28:09 -0500 |
commit | bb0531e86e404b831151e502f0426254a1b152c1 (patch) | |
tree | 50f94f93458d35f2304b2a659fca38e9e1d29841 | |
parent | 782a42abcb12fa49030b4f1e73cf5b4d3eddd220 (diff) | |
download | sqlalchemy-bb0531e86e404b831151e502f0426254a1b152c1.tar.gz |
Ensure API generation and fix cross references
-rw-r--r-- | doc/build/core/selectable.rst | 3 | ||||
-rw-r--r-- | doc/build/core/sqlelement.rst | 21 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/operators.py | 7 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 4 |
4 files changed, 31 insertions, 4 deletions
diff --git a/doc/build/core/selectable.rst b/doc/build/core/selectable.rst index 341ffcca6..5455a46a0 100644 --- a/doc/build/core/selectable.rst +++ b/doc/build/core/selectable.rst @@ -59,6 +59,9 @@ elements are themselves :class:`.ColumnElement` subclasses). :members: :inherited-members: +.. autoclass:: ScalarSelect + :members: + .. autoclass:: Select :members: :inherited-members: diff --git a/doc/build/core/sqlelement.rst b/doc/build/core/sqlelement.rst index e39c988d4..2c6ef3112 100644 --- a/doc/build/core/sqlelement.rst +++ b/doc/build/core/sqlelement.rst @@ -69,6 +69,12 @@ used to construct any kind of typed SQL expression. .. autoclass:: BindParameter :members: +.. autoclass:: Case + :members: + +.. autoclass:: Cast + :members: + .. autoclass:: ClauseElement :members: @@ -93,12 +99,27 @@ used to construct any kind of typed SQL expression. :special-members: :inherited-members: +.. autoclass:: Extract + :members: + .. autoclass:: sqlalchemy.sql.elements.False_ :members: +.. autoclass:: Label + :members: + .. autoclass:: sqlalchemy.sql.elements.Null :members: +.. autoclass:: Over + :members: + +.. autoclass:: TextClause + :members: + +.. autoclass:: Tuple + :members: + .. autoclass:: sqlalchemy.sql.elements.True_ :members: diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py index e9b904d7c..5bd4b302b 100644 --- a/lib/sqlalchemy/sql/operators.py +++ b/lib/sqlalchemy/sql/operators.py @@ -27,8 +27,11 @@ else: class Operators(object): """Base of comparison and logical operators. - Implements base methods :meth:`operate` and :meth:`reverse_operate`, - as well as :meth:`__and__`, :meth:`__or__`, :meth:`__invert__`. + Implements base methods :meth:`~sqlalchemy.sql.operators.Operators.operate` and + :meth:`~sqlalchemy.sql.operators.Operators.reverse_operate`, as well as + :meth:`~sqlalchemy.sql.operators.Operators.__and__`, + :meth:`~sqlalchemy.sql.operators.Operators.__or__`, + :meth:`~sqlalchemy.sql.operators.Operators.__invert__`. Usually is used via its most common subclass :class:`.ColumnOperators`. diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 4fcf06290..046840110 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -1347,8 +1347,8 @@ class SelectBase(Executable, FromClause): @_generative @util.deprecated('0.6', - message=":func:`.autocommit` is deprecated. Use " - ":func:`.Executable.execution_options` with the " + message="``autocommit()`` is deprecated. Use " + ":meth:`.Executable.execution_options` with the " "'autocommit' flag.") def autocommit(self): """return a new selectable with the 'autocommit' flag set to |