summaryrefslogtreecommitdiff
path: root/doc/build/faq
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-03-25 11:34:19 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-03-25 11:34:19 -0400
commit478185d05df86c73ad212a11732eb5374c8637a1 (patch)
tree16eb78dd2fba721a78a8450af1f88af19ea7dd7e /doc/build/faq
parent050dee534b888a9a8e6768d2ad16c3f2380c7c9c (diff)
downloadsqlalchemy-478185d05df86c73ad212a11732eb5374c8637a1.tar.gz
Correct ambiguous func / class links
:func:`.sql.expression.select`, :func:`.sql.expression.insert` and :class:`.sql.expression.Insert` were hitting many ambiguous symbol errors, due to future.select, as well as the PG/MySQL variants of Insert. Change-Id: Iac862bfc172a7f7f0cbba5353a83dc203bed376c
Diffstat (limited to 'doc/build/faq')
-rw-r--r--doc/build/faq/ormconfiguration.rst2
-rw-r--r--doc/build/faq/sqlexpressions.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/faq/ormconfiguration.rst b/doc/build/faq/ormconfiguration.rst
index 589a7a151..be84a421f 100644
--- a/doc/build/faq/ormconfiguration.rst
+++ b/doc/build/faq/ormconfiguration.rst
@@ -35,7 +35,7 @@ and is also key to the most common (and not-so-common) patterns of ORM usage.
It's important to note that we're only talking about the SQLAlchemy ORM; an
application which builds on Core and deals only with :class:`.Table` objects,
- :func:`.select` constructs and the like, **does not** need any primary key
+ :func:`~.sql.expression.select` constructs and the like, **does not** need any primary key
to be present on or associated with a table in any way (though again, in SQL, all tables
should really have some kind of primary key, lest you need to actually
update or delete specific rows).
diff --git a/doc/build/faq/sqlexpressions.rst b/doc/build/faq/sqlexpressions.rst
index 0dd5e10df..f2d045d0c 100644
--- a/doc/build/faq/sqlexpressions.rst
+++ b/doc/build/faq/sqlexpressions.rst
@@ -27,7 +27,7 @@ if we don't use it explicitly)::
The ``str()`` builtin, or an equivalent, can be invoked on ORM
:class:`.Query` object as well as any statement such as that of
-:func:`.select`, :func:`.insert` etc. and also any expression fragment, such
+:func:`~.sql.expression.select`, :func:`~.sql.expression.insert` etc. and also any expression fragment, such
as::
>>> from sqlalchemy import column