summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/functions.py
diff options
context:
space:
mode:
authorGord Thompson <gord@gordthompson.com>2021-02-13 14:43:21 -0700
committerGord Thompson <gord@gordthompson.com>2021-02-15 11:16:38 -0700
commit857adaaf867df54d4a023cf19f618fdf1d0f60c9 (patch)
tree6079150053100063a2b865c7b2c9702dbcab7e3a /lib/sqlalchemy/sql/functions.py
parentd642946939416ea2870cf6c6479dcddad795b622 (diff)
downloadsqlalchemy-857adaaf867df54d4a023cf19f618fdf1d0f60c9.tar.gz
Accept ColumnCollection in update_on_conflict(set_=
Fixes: #5939 Change-Id: I21d7125765028e2a98d5ef4c32d8e7e457aa2d12
Diffstat (limited to 'lib/sqlalchemy/sql/functions.py')
-rw-r--r--lib/sqlalchemy/sql/functions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 641715327..40af73d7a 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -163,7 +163,7 @@ class FunctionElement(Executable, ColumnElement, FromClause, Generative):
return ScalarFunctionColumn(self, name, type_)
def table_valued(self, *expr, **kw):
- """Return a :class:`_sql.TableValuedAlias` representation of this
+ r"""Return a :class:`_sql.TableValuedAlias` representation of this
:class:`_functions.FunctionElement` with table-valued expressions added.
e.g.::