diff options
Diffstat (limited to 'lib/sqlalchemy/dialects/sqlite/dml.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/dml.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/dml.py b/lib/sqlalchemy/dialects/sqlite/dml.py index be32781c7..4cb819960 100644 --- a/lib/sqlalchemy/dialects/sqlite/dml.py +++ b/lib/sqlalchemy/dialects/sqlite/dml.py @@ -9,6 +9,7 @@ from ...sql import coercions from ...sql import roles from ...sql.base import _exclusive_against from ...sql.base import _generative +from ...sql.base import ColumnCollection from ...sql.dml import Insert as StandardInsert from ...sql.elements import ClauseElement from ...sql.expression import alias @@ -169,8 +170,17 @@ class OnConflictDoUpdate(OnConflictClause): index_where=index_where, ) - if not isinstance(set_, dict) or not set_: - raise ValueError("set parameter must be a non-empty dictionary") + if isinstance(set_, dict): + if not set_: + raise ValueError("set parameter dictionary must not be empty") + elif isinstance(set_, ColumnCollection): + set_ = dict(set_) + else: + raise ValueError( + "set parameter must be a non-empty dictionary " + "or a ColumnCollection such as the `.c.` collection " + "of a Table object" + ) self.update_values_to_set = [ (coercions.expect(roles.DMLColumnRole, key), value) for key, value in set_.items() |
