From c723b8d8d138366269361c25d27d47251eb9b791 Mon Sep 17 00:00:00 2001 From: Robin Thomas Date: Thu, 14 Apr 2016 12:47:03 -0400 Subject: argh fixed regression from copy-paste --- lib/sqlalchemy/dialects/postgresql/on_conflict.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/sqlalchemy/dialects/postgresql') 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): -- cgit v1.2.1