Updating ON CONFLICT statements

SimonGoring · SimonGoring · commit 0f1bb81bc90b · 2023-04-13T14:56:41.000-07:00
ON CONFLICT was trying to run only on specific columns. I've cleaned that out so it runs on any set of conflicts.
diff --git a/function/ts/insertdatasetpi.sql b/function/ts/insertdatasetpi.sql
@@ -4,5 +4,5 @@ CREATE OR REPLACE FUNCTION ts.insertdatasetpi(_datasetid integer, _contactid int
 AS $function$
 INSERT INTO ndb.datasetpis(datasetid, contactid, piorder)
 VALUES (_datasetid, _contactid, _piorder)
-ON CONFLICT (datasetid, contactid) DO NOTHING;
+ON CONFLICT DO NOTHING;
 $function$
diff --git a/function/ts/insertsteward.sql b/function/ts/insertsteward.sql
@@ -14,4 +14,3 @@ AS $function$
   values      ((select stewardid from ti.stewards AS stw where (stw.contactid = _contactid)), _databaseid)
   RETURNING stewardid
 $function$
-
diff --git a/function/ts/updatechroncontrolevent.sql b/function/ts/updatechroncontrolevent.sql
@@ -5,7 +5,7 @@ AS $function$
   INSERT INTO ndb.eventchronology
     (analysisunitid, eventid, chroncontrolid)
   VALUES (_analysisunitid, _eventid, _chroncontrolid)
-  ON CONFLICT ON CONSTRAINT uniqueeventset
+  ON CONFLICT (analysisunitid, eventid, chroncontrolid)
   DO UPDATE
     SET   analysisunitid = _analysisunitid, eventid = _eventid, chroncontrolid = _chroncontrolid, notes = null
   WHERE ndb.eventchronology.eventchronologyid = (SELECT ec.eventchronologyid FROM ndb.eventchronology AS ec WHERE (chroncontrolid = _chroncontrolid))
