Removed references to the steward updates. Functions should work now.

SimonGoring · SimonGoring · commit 17e1b37cb991 · 2020-09-17T10:08:03.000-07:00
diff --git a/function/ts/updatelakeparam.sql b/function/ts/updatelakeparam.sql
@@ -5,34 +5,36 @@ CREATE OR REPLACE FUNCTION ts.updatelakeparam(_siteid integer,
  RETURNS void
  LANGUAGE plpgsql
 AS $function$
-DECLARE
+  DECLARE
 
-	_lakeparameterid int := (SELECT lp.lakeparameterid FROM ndb.lakeparametertypes AS lp WHERE lp.lakeparameter = _lakeparameter);
-	_nparam int := (SELECT COUNT(*) AS count FROM ndb.lakeparameters AS lp WHERE lp.siteid = _siteid GROUP BY lp.lakeparameterid HAVING lp.lakeparameterid = lakeparameterid);
-	/* If nparam is not null, then the LakeParameter is already in Neotoma */
+  	_lakeparameterid int := (
+      SELECT lp.lakeparameterid
+      FROM ndb.lakeparametertypes AS lp
+      WHERE lp.lakeparameter = _lakeparameter);
+  	_nparam int := (
+      SELECT COUNT(*) AS count
+      FROM ndb.lakeparameters AS lp
+      WHERE lp.siteid = _siteid
+      GROUP BY lp.lakeparameterid
+      HAVING lp.lakeparameterid = lakeparameterid);
 
-BEGIN
+    /* If nparam is not null, then the LakeParameter is already in Neotoma */
 
-	IF _value IS NOT NULL THEN
-		IF _nparam IS NOT NULL THEN  /* parameter in Neotoma, need to change */
-			UPDATE ndb.lakeparameters AS lp
-			SET value = value WHERE (siteid = _siteid) AND (lp.lakeparameterid = _lakeparameterid);
-			INSERT INTO ti.stewardupdates(contactid, tablename, pk1, pk2, operation, columnname)
-            VALUES (_stewardcontactid, 'lakeparameters',_siteid, _lakeparameterid, 'update', 'value');
-		ELSE
-			INSERT INTO ndb.lakeparameters (siteid, lakeparameterid, value)
-			VALUES (_siteid, _lakeparameterid, _value);
-			INSERT INTO ti.stewardupdates(contactid, tablename, pk1, pk2, operation)
-            VALUES (_stewardcontactid, 'lakeparameters', _siteid, _lakeparameterid, 'insert');
-		END IF;
-	ELSE
-		IF _nparam IS NOT NULL THEN  /* parameter in Neotoma, need to delete */
-			DELETE FROM ndb.lakeparameters AS lp
-			WHERE (lp.siteid = _siteid) AND (lp.lakeparameterid = _lakeparameterid);
-			INSERT INTO ti.stewardupdates(contactid, tablename, pk1, pk2, operation)
-            VALUES (_stewardcontactid, 'lakeparameters', _siteid, _lakeparameterid, 'delete');
-		END IF;
-	END IF;
-END;
+  BEGIN
+  	IF _value IS NOT NULL THEN
+  		IF _nparam IS NOT NULL THEN  /* parameter in Neotoma, need to change */
+  			UPDATE ndb.lakeparameters AS lp
+  			SET value = _value WHERE (siteid = _siteid) AND (lp.lakeparameterid = _lakeparameterid);
+  		ELSE
+  			INSERT INTO ndb.lakeparameters (siteid, lakeparameterid, value)
+  			VALUES (_siteid, _lakeparameterid, _value);
+  		END IF;
+  	ELSE
+  		IF _nparam IS NOT NULL THEN  /* parameter in Neotoma, need to delete */
+  			DELETE FROM ndb.lakeparameters AS lp
+  			WHERE (lp.siteid = _siteid) AND (lp.lakeparameterid = _lakeparameterid);
+  		END IF;
+  	END IF;
+  END;
 
 $function$
diff --git a/function/ts/updatesitegeopolinsert.sql b/function/ts/updatesitegeopolinsert.sql
@@ -1,20 +1,10 @@
 CREATE OR REPLACE FUNCTION ts.updatesitegeopolinsert(_siteid integer, _stewardcontactid integer, _geopoliticalid integer)
  RETURNS void
- LANGUAGE plpgsql
+ LANGUAGE sql
 AS $function$
 BEGIN
-	BEGIN
 	INSERT INTO ndb.sitegeopolitical(siteid, geopoliticalid)
 	VALUES  (_siteid, _geopoliticalid);
-	END;
-
-	DECLARE
-		_newsitegeopoliticalid int := (SELECT sitegeopoliticalid FROM ndb.sitegeopolitical WHERE (siteid = _siteid AND geopoliticalid = _geopoliticalid));
-
-	BEGIN
-	INSERT INTO ti.stewardupdates(contactid, tablename, pk1, operation)
-	VALUES  (_stewardcontactid, 'sitegeopolitical', _newsitegeopoliticalid, 'insert');
-	END;
 END;
 
 $function$
