summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Thomas <robin.thomas@livestream.com>2016-04-14 12:47:03 -0400
committerRobin Thomas <robin.thomas@livestream.com>2016-04-14 12:47:03 -0400
commitc723b8d8d138366269361c25d27d47251eb9b791 (patch)
tree20e0e287c1c974186f5439a3b5613ed2ff14c8e1
parent7760511b3d1df21c6291bb3978bc02c802cde2fe (diff)
downloadsqlalchemy-pr/258.tar.gz
argh fixed regression from copy-pastepr/258
-rw-r--r--lib/sqlalchemy/dialects/postgresql/on_conflict.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/on_conflict.py b/lib/sqlalchemy/dialects/postgresql/on_conflict.py
index 1fa0f1552..5335d3c1c 100644
--- a/lib/sqlalchemy/dialects/postgresql/on_conflict.py
+++ b/lib/sqlalchemy/dialects/postgresql/on_conflict.py
@@ -62,7 +62,6 @@ class DoUpdate(OnConflictClause):
These columns will be added to the ``SET`` clause using the `excluded` row's
values from the same columns. e.g. ``SET colname = excluded.colname``.
"""
- super(DoUpdate, self).__init__(ConflictTarget(conflict_target))
for col in columns:
if not isinstance(col, (ColumnClause, str)):
raise ValueError(
@@ -90,7 +89,6 @@ class DoNothing(OnConflictClause):
If omitted, allows any unique constraint violation to cause
the row insertion to be skipped.
"""
- super(DoUpdate, self).__init__(ConflictTarget(conflict_target))
super(DoNothing, self).__init__(ConflictTarget(conflict_target) if conflict_target else None)
class ConflictTarget(ClauseElement):