summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-02-25 20:10:52 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-02-25 20:10:52 -0500
commitf9492ef90641c2fa55bcd1ecc93ddcef7f82f08d (patch)
treebeff152a4e348a5842ee973d0080af48062df3d4 /doc
parent33f07202ce2d9d34f346e9629dc602d920091cf1 (diff)
downloadsqlalchemy-f9492ef90641c2fa55bcd1ecc93ddcef7f82f08d.tar.gz
docs
Diffstat (limited to 'doc')
-rw-r--r--doc/build/builder/autodoc_mods.py7
-rw-r--r--doc/build/core/constraints.rst14
2 files changed, 15 insertions, 6 deletions
diff --git a/doc/build/builder/autodoc_mods.py b/doc/build/builder/autodoc_mods.py
index 8e13d76af..5a6e991bd 100644
--- a/doc/build/builder/autodoc_mods.py
+++ b/doc/build/builder/autodoc_mods.py
@@ -23,13 +23,14 @@ _convert_modname = {
_convert_modname_w_class = {
("sqlalchemy.engine.interfaces", "Connectable"): "sqlalchemy.engine",
+ ("sqlalchemy.sql.base", "DialectKWArgs"): "sqlalchemy.sql.base",
}
def _adjust_rendered_mod_name(modname, objname):
- if modname in _convert_modname:
- return _convert_modname[modname]
- elif (modname, objname) in _convert_modname_w_class:
+ if (modname, objname) in _convert_modname_w_class:
return _convert_modname_w_class[(modname, objname)]
+ elif modname in _convert_modname:
+ return _convert_modname[modname]
else:
return modname
diff --git a/doc/build/core/constraints.rst b/doc/build/core/constraints.rst
index 91f794de1..3979631b0 100644
--- a/doc/build/core/constraints.rst
+++ b/doc/build/core/constraints.rst
@@ -431,26 +431,33 @@ name as follows::
Constraints API
---------------
.. autoclass:: Constraint
-
+ :members:
.. autoclass:: CheckConstraint
-
+ :members:
+ :inherited-members:
.. autoclass:: ColumnCollectionConstraint
-
+ :members:
.. autoclass:: ForeignKey
:members:
+ :inherited-members:
.. autoclass:: ForeignKeyConstraint
:members:
+ :inherited-members:
.. autoclass:: PrimaryKeyConstraint
+ :members:
+ :inherited-members:
.. autoclass:: UniqueConstraint
+ :members:
+ :inherited-members:
.. _schema_indexes:
@@ -569,3 +576,4 @@ Index API
.. autoclass:: Index
:members:
+ :inherited-members: