diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-02-08 14:53:21 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-02-08 14:53:21 -0500 |
| commit | 660ff51df0433607b12c58a12c7355107c1773f5 (patch) | |
| tree | 95c43ce2401ee5aee3d8b3dfa6d241c633d23279 /lib/sqlalchemy/dialects/mysql/base.py | |
| parent | 47aa62abde6eba67802f2f7126cc79fbd95b5d1a (diff) | |
| download | sqlalchemy-660ff51df0433607b12c58a12c7355107c1773f5.tar.gz | |
Fixes for public_factory and mysql/pg dml functions
* ensure that the location indicated by public_factory is
importable
* adjust all of sqlalchemy.sql.expression locations to be correct
* support the case where a public_factory is against a function
that has another public_factory already, and already replaced the
__init__ on the target class
* Use mysql.insert(), postgresql.insert(), don't include .dml in the
class path.
Change-Id: Iac285289455d8d7102349df3814f7cedc758e639
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/base.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 6e84c9da1..e0bf16793 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -352,8 +352,8 @@ will be performed. The statement allows for separate specification of the values to INSERT versus the values for UPDATE. SQLAlchemy provides ``ON DUPLICATE KEY UPDATE`` support via the MySQL-specific -:func:`.mysql.dml.insert()` function, which provides -the generative method :meth:`~.mysql.dml.Insert.on_duplicate_key_update`:: +:func:`.mysql.insert()` function, which provides +the generative method :meth:`~.mysql.Insert.on_duplicate_key_update`:: from sqlalchemy.dialects.mysql import insert @@ -377,7 +377,7 @@ an error or to skip performing an UPDATE. existing row, using any combination of new values as well as values from the proposed insertion. These values are normally specified using keyword arguments passed to the -:meth:`~.mysql.dml.Insert.on_duplicate_key_update` +:meth:`~.mysql.Insert.on_duplicate_key_update` given column key values (usually the name of the column, unless it specifies :paramref:`.Column.key`) as keys and literal or SQL expressions as values:: @@ -421,8 +421,8 @@ this context is unambiguous:: In order to refer to the proposed insertion row, the special alias -:attr:`~.mysql.dml.Insert.inserted` is available as an attribute on -the :class:`.mysql.dml.Insert` object; this object is a +:attr:`~.mysql.Insert.inserted` is available as an attribute on +the :class:`.mysql.Insert` object; this object is a :class:`.ColumnCollection` which contains all columns of the target table:: |