@nsshunt/stsdatamanagement 1.18.98 → 1.18.99

package/db-scripts/builddb.sql

@@ -28,356 +28,6 @@ ALTER SEQUENCE public.stsresource_oid_seq
     OWNER TO postgres;
 
 
-CREATE SEQUENCE public.stsmonitor_oid_seq
-  AS BIGINT
-    INCREMENT 1
-    START 1
-    MINVALUE 1
-    CACHE 1;
-
-ALTER SEQUENCE public.stsmonitor_oid_seq
-    OWNER TO postgres;
-
-
------[ stsmonitor ]--------------------------------
-
-CREATE TABLE public.stsmonitor
-(
-    oid bigint NOT NULL DEFAULT nextval('stsmonitor_oid_seq'::regclass),
-
-	-- main graph key
-	context character varying COLLATE pg_catalog."default" NOT NULL,
-
-	-- Tree level attributes (context)
-	servicetype character varying COLLATE pg_catalog."default" NOT NULL,
-	serviceid character varying COLLATE pg_catalog."default" NOT NULL,
-	serviceinstanceid character varying COLLATE pg_catalog."default" NOT NULL,
-	serviceidhostname character varying COLLATE pg_catalog."default" NOT NULL,
-
-	serviceinstanceprocessid character varying COLLATE pg_catalog."default" NOT NULL,
-	pid integer NOT NULL,
-	ppid integer NOT NULL,
-	ismaster boolean NOT NULL,
-	isworker boolean NOT NULL,
-	servicename character varying COLLATE pg_catalog."default" NOT NULL,
-	serviceversion character varying COLLATE pg_catalog."default" NOT NULL,
-
-	-- Leaf level attributes
-	-- Count based (summed in summary views)
-	request_count_gauge integer NULL,
-	error_count_gauge integer NULL,
-	retry_count_gauge integer NULL,
-	authentication_count_gauge integer NULL,
-	velocity_gauge integer NULL,
-	cpu_load_gauge numeric NULL,
-	active_request_gauge integer NULL,
-	connection_count_gauge integer NULL,
-	connection_pool_total_gauge integer NULL,
-	connection_pool_idle_gauge integer NULL,
-	connection_pool_waiting_gauge integer NULL,
-	core_count_gauge integer NULL,
-
-    -- Define the gauges that provide a point in time value that conveys meaning at that point in time.
-    -- These values will not be aggregated (summed) in summary views.
-	timer_gauge numeric NULL,
-
-	-- average gauges
-	duration_gauge numeric NULL,
-    latency_gauge numeric NULL,
-
-    -- Define the histogram gauges
-	duration_histogram_gauge integer ARRAY NULL,
-	latency_histogram_gauge integer ARRAY NULL,
-
-    -- Define logger based gauges
-	logger  character varying COLLATE pg_catalog."default",
-
-	-- Standard STS attributes
-    validfrom timestamp with time zone NOT NULL,
-    validto timestamp with time zone,
-    vnum bigint NOT NULL,
-    dbaction smallint NOT NULL,
-    dbactionuser character varying COLLATE pg_catalog."default" NOT NULL,
-    CONSTRAINT stsmonitor_pkey PRIMARY KEY (oid)
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE public.stsmonitor
-    OWNER to postgres;
--- Index: stsresource_resname_vnum;
-
--- DROP INDEX public.stsresource_resname_vnum;
-
-CREATE UNIQUE INDEX stsmonitor_prim_index
-    ON public.stsmonitor USING btree
-    (context COLLATE pg_catalog."default" ASC NULLS LAST, 
-		servicetype COLLATE pg_catalog."default" ASC NULLS LAST, 
-		serviceid COLLATE pg_catalog."default" ASC NULLS LAST,
-		serviceinstanceid COLLATE pg_catalog."default" ASC NULLS LAST,
-		serviceidhostname COLLATE pg_catalog."default" ASC NULLS LAST)
-    TABLESPACE pg_default;
-
-
-CREATE OR REPLACE FUNCTION public.create_stsmonitor(
-	_dbactionuser character varying, -- 1
-
-	_context character varying, -- 2
-
-	_servicetype character varying, -- 3
-	_serviceid character varying, -- 4
-	_serviceinstanceid character varying, -- 5
-	_serviceidhostname character varying, -- 6
-
-	_serviceinstanceprocessid character varying, -- 7
-	_pid integer, -- 8
-	_ppid integer, -- 9
-	_ismaster boolean, -- 10
-	_isworker boolean, -- 11
-	_servicename character varying, -- 12
-	_serviceversion character varying, -- 13
-
-	-- Leaf level attributes
-	-- Count based (summed in summary views)
-	_request_count_gauge integer, -- 14
-	_error_count_gauge integer, -- 15
-	_retry_count_gauge integer, -- 16
-	_authentication_count_gauge integer, -- 17
-	_velocity_gauge numeric, -- 18
-	_cpu_load_gauge numeric , -- 19
-	_active_request_gauge integer, -- 20
-	_connection_count_gauge integer, -- 21
-	_connection_pool_total_gauge integer, -- 22
-	_connection_pool_idle_gauge integer, -- 23
-	_connection_pool_waiting_gauge integer, -- 24
-	_core_count_gauge integer, -- 25
-
-    -- Define the gauges that provide a point in time value that conveys meaning at that point in time.
-    -- These values will not be aggregated (summed) in summary views.
-	_timer_gauge numeric, -- 26
-
-	-- average gauges
-	_duration_gauge numeric, -- 27
-    _latency_gauge numeric, -- 28
-
-    -- Define the histogram gauges
-	_duration_histogram_gauge integer ARRAY, -- 29
-	_latency_histogram_gauge integer ARRAY -- 30
-	)
-    RETURNS SETOF stsmonitor
-    LANGUAGE 'plpgsql'
-
-    COST 100
-    VOLATILE 
-    ROWS 1000
-    
-AS $BODY$
-DECLARE
-	__now timestamp without time zone := now();
-	__resoid bigint;
-	__vnum bigint;
-	__dbaction smallint;
-	__inserted_oid bigint;
-BEGIN
-	begin
-		select oid, vnum, dbaction into __resoid, __vnum, __dbaction from stsmonitor m where m.context = _context and m.validto is null;
-		-- Too many records exists using the supplied data, the database is in an invalid state for this resource
-		exception
-			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsmonitor records for current version using stsmonitor %', _context USING ERRCODE = 'cardinality_violation';
-	end;
-  
-	if __resoid is not null then
-		-- We have an existing resource
-		if __dbaction = 1 or __dbaction = 2 or __dbaction = 3 then
-			-- The existing resource is deleted, update the current version
-			update stsmonitor
-
-			set dbactionuser = _dbactionuser, -- 1
-				context = _context, -- 2
-				servicetype = _servicetype, -- 3
-				serviceid = _serviceid, -- 4
-				serviceinstanceid = _serviceinstanceid, -- 5
-				serviceidhostname = _serviceidhostname, -- 6
-
-				serviceinstanceprocessid = _serviceinstanceprocessid, -- 7
-				pid = _pid, -- 8
-				ppid = _ppid, -- 9
-				ismaster = _ismaster, -- 10
-				isworker = _isworker, -- 11
-				servicename = _servicename, -- 12
-				serviceversion = _serviceversion, -- 13
-
-				request_count_gauge = _request_count_gauge, -- 14
-				error_count_gauge = _error_count_gauge, -- 15
-				retry_count_gauge = _retry_count_gauge, -- 16
-				authentication_count_gauge = _authentication_count_gauge, -- 17
-				velocity_gauge = _velocity_gauge, -- 18
-				cpu_load_gauge = _cpu_load_gauge, -- 19
-				active_request_gauge = _active_request_gauge, -- 20
-				connection_count_gauge = _connection_count_gauge, -- 21
-				connection_pool_total_gauge = _connection_pool_total_gauge, -- 22
-				connection_pool_idle_gauge = _connection_pool_idle_gauge, -- 23
-				connection_pool_waiting_gauge = _connection_pool_waiting_gauge, -- 24
-				core_count_gauge = _core_count_gauge, -- 25
-
-				timer_gauge = _timer_gauge, -- 26
-
-				duration_gauge = _duration_gauge, -- 27
-				latency_gauge = _latency_gauge, -- 28
-
-				duration_histogram_gauge = _duration_histogram_gauge, -- 29
-				latency_histogram_gauge = _latency_histogram_gauge, -- 30
-
-				validfrom = __now,
-				dbaction = 2 -- updated
-
-			where oid = __resoid;
-
-			return query
-			select * from stsmonitor where oid = __resoid;
-		else
-			-- The current version is in an active state, raise unique violate condition
-	        RAISE 'Duplicate context within stsmonitor: %', _context USING ERRCODE = 'unique_violation';
-		end if;
-	else
-		/*
-		For some unknown reason, the below works in pg outside and inside a docker container
-		but does NOT work inside a docker swarm or a K3 cluster.
-		-- No current version exists, create a new record
-		return query
-		insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		values (_resname, _resdesc, 1, 1, _dbactionuser, __now) 
-		returning *;
-		*/
-
-		insert into stsmonitor(
-			context,
-			servicetype,
-			serviceid,
-			serviceinstanceid,
-			serviceidhostname,
-
-			serviceinstanceprocessid,
-			pid,
-			ppid,
-			ismaster,
-			isworker,
-			servicename,
-			serviceversion,
-
-			request_count_gauge,
-			error_count_gauge,
-			retry_count_gauge,
-			authentication_count_gauge,
-			velocity_gauge,
-			cpu_load_gauge,
-			active_request_gauge,
-			connection_count_gauge,
-			connection_pool_total_gauge,
-			connection_pool_idle_gauge,
-			connection_pool_waiting_gauge,
-			core_count_gauge,
-
-			timer_gauge,
-
-			duration_gauge,
-			latency_gauge,
-
-			duration_histogram_gauge,
-			latency_histogram_gauge,
-
-			vnum, dbaction, dbactionuser, validfrom)
-		values (
-			_context,
-			_servicetype,
-			_serviceid,
-			_serviceinstanceid,
-			_serviceidhostname,
-
-			_serviceinstanceprocessid,
-			_pid,
-			_ppid,
-			_ismaster,
-			_isworker,
-			_servicename,
-			_serviceversion,
-
-			_request_count_gauge,
-			_error_count_gauge,
-			_retry_count_gauge,
-			_authentication_count_gauge,
-			_velocity_gauge,
-			_cpu_load_gauge,
-			_active_request_gauge,
-			_connection_count_gauge,
-			_connection_pool_total_gauge,
-			_connection_pool_idle_gauge,
-			_connection_pool_waiting_gauge,
-			_core_count_gauge,
-
-			_timer_gauge,
-
-			_duration_gauge,
-			_latency_gauge,
-
-			_duration_histogram_gauge,
-			_latency_histogram_gauge,
-		
-			1, 1, _dbactionuser, __now)
-		returning oid into __inserted_oid;
-
-		return query
-		select * from stsmonitor where oid = __inserted_oid;
-	end if;
-END;
-$BODY$;
-
-ALTER FUNCTION public.create_stsmonitor(
-	character varying, -- 1 userid
-
-	character varying, -- 2 context
-
-	character varying, -- 3
-	character varying, -- 4
-	character varying, -- 5
-	character varying, -- 6
-
-	character varying, -- 7
-	integer, -- 8
-	integer, -- 9
-	boolean, -- 10
-	boolean, -- 11
-	character varying, -- 12
-	character varying, -- 13
-
-	integer, -- 14
-	integer, -- 15
-	integer, -- 16
-	integer, -- 17
-	numeric, -- 18 velocity
-	numeric, -- 19 cpu
-	integer, -- 20
-	integer, -- 21
-	integer, -- 22
-	integer, -- 23
-	integer, -- 24
-	integer, -- 25
- 
-	numeric, -- 26 timer
-
-	numeric, -- 27
-    numeric, -- 28
-
-	integer ARRAY, -- 29
-	integer ARRAY -- 30
-	)
-    OWNER TO postgres;
-
-
-
-
-
 -- [ Table: public.stsresource ] ------------------------------------------------------------------------
 
 -- DROP TABLE public.stsresource;
@@ -387,6 +37,7 @@ CREATE TABLE public.stsresource
     oid bigint NOT NULL DEFAULT nextval('stsresource_oid_seq'::regclass),
     resname character varying(128) COLLATE pg_catalog."default" NOT NULL,
     resdesc character varying(32768) COLLATE pg_catalog."default",
+	resdesc_jsonb jsonb,
     vnum bigint NOT NULL,
     validfrom timestamp with time zone NOT NULL,
     validto timestamp with time zone,
@@ -394,7 +45,6 @@ CREATE TABLE public.stsresource
     dbactionuser character varying(64) COLLATE pg_catalog."default" NOT NULL,
     CONSTRAINT stsresource_pkey PRIMARY KEY (oid)
 )
-
 TABLESPACE pg_default;
 
 ALTER TABLE public.stsresource
@@ -418,147 +68,6 @@ CREATE INDEX stsresource_resname_validto
     TABLESPACE pg_default;
 
 
-
--- Table: public.stsentity
-
--- DROP TABLE public.stsentity;
-
-CREATE TABLE public.stsentity
-(
-    oid bigint NOT NULL DEFAULT nextval('stsentity_oid_seq'::regclass),
-    resourceoid integer NOT NULL,
-    entname character varying(128) COLLATE pg_catalog."default" NOT NULL,
-    entvalue character varying(32768) COLLATE pg_catalog."default",
-    vnum bigint NOT NULL,
-    validfrom timestamp without time zone NOT NULL,
-    validto timestamp without time zone,
-    dbaction smallint NOT NULL,
-    dbactionuser character varying(64) COLLATE pg_catalog."default" NOT NULL,
-    CONSTRAINT stsentity_pkey PRIMARY KEY (oid),
-    CONSTRAINT fk_stsresource FOREIGN KEY (resourceoid)
-        REFERENCES public.stsresource (oid) MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE CASCADE
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE public.stsentity
-    OWNER to postgres;
-
--- Index: stsentity_resourceoid_entname_vnum
-
--- DROP INDEX public.stsentity_resourceoid_entname_vnum;
-
-CREATE UNIQUE INDEX stsentity_resourceoid_entname_vnum
-    ON public.stsentity USING btree
-    (resourceoid ASC NULLS LAST, entname COLLATE pg_catalog."default" ASC NULLS LAST, vnum ASC NULLS LAST)
-    TABLESPACE pg_default;
-
--- Index: stsentity_resourceoid_entname_validto
-
--- DROP INDEX public.stsentity_resourceoid_entname_validto;
-
-CREATE INDEX stsentity_resourceoid_entname_validto
-    ON public.stsentity USING btree
-    (resourceoid ASC NULLS LAST, entname COLLATE pg_catalog."default" ASC NULLS LAST, validto DESC NULLS LAST)
-    TABLESPACE pg_default;
-
-
--- FUNCTION: public.create_stsentity(character varying, character varying, integer, character varying, character varying)
-
--- DROP FUNCTION public.create_stsentity(character varying, character varying, integer, character varying, character varying);
-
-CREATE OR REPLACE FUNCTION public.create_stsentity(
-	_dbactionuser character varying,
-	_resname character varying,
-	_resvnum integer,
-	_entname character varying,
-	_entvalue character varying)
-    RETURNS SETOF stsentity 
-    LANGUAGE 'plpgsql'
-
-    COST 100
-    VOLATILE 
-    ROWS 1000
-    
-AS $BODY$
-declare
-	resoid bigint;
-	__inserted_oid bigint;
-BEGIN
-	-- Ensure we get the current non-deleted resource.
-	resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
-	if resoid is null then
- 		-- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-	        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
-	end if;
-	if (select count(*) from stsentity e 
-		where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3) > 0 then
-	    -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-	    -- RAISE EXCEPTION 'resname already exists within stsresource %', now();
-        RAISE 'Duplicate entname within stsresource: %', _resname USING ERRCODE = 'unique_violation';
-	else
-		insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		values (resoid, _entname, _entvalue, 1, 1, _dbactionuser, now())
-		returning oid into __inserted_oid;
-
-		return query
-		select * from stsentity where oid = __inserted_oid;
-    END IF;
-END;
-$BODY$;
-
-ALTER FUNCTION public.create_stsentity(character varying, character varying, integer, character varying, character varying)
-    OWNER TO postgres;
-
-
-
-
-CREATE OR REPLACE FUNCTION public.create_stsentity_latest(
-	_dbactionuser character varying,
-	_resname character varying,
-	_entname character varying,
-	_entvalue character varying)
-    RETURNS SETOF stsentity 
-    LANGUAGE 'plpgsql'
-
-    COST 100
-    VOLATILE 
-    ROWS 1000
-    
-AS $BODY$
-declare
-	resoid bigint;
-	__inserted_oid bigint;
-BEGIN
-	-- Ensure we get the current non-deleted resource.
-	resoid := (select oid from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
-	if resoid is null then
- 		-- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-	        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
-	end if;
-	if (select count(*) from stsentity e 
-		where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3) > 0 then
-	    -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-	    -- RAISE EXCEPTION 'resname already exists within stsresource %', now();
-        RAISE 'Duplicate entname within stsresource: %', _resname USING ERRCODE = 'unique_violation';
-	else
-		insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		values (resoid, _entname, _entvalue, 1, 1, _dbactionuser, now())
-		returning oid into __inserted_oid;
-
-		return query
-		select * from stsentity where oid = __inserted_oid;
-    END IF;
-END;
-$BODY$;
-
-ALTER FUNCTION public.create_stsentity_latest(character varying, character varying, character varying, character varying)
-    OWNER TO postgres;
-
-
-
 -- FUNCTION: public.create_stsresource(character varying, character varying, character varying)
 
 -- DROP FUNCTION public.create_stsresource(character varying, character varying, character varying);
@@ -581,7 +90,15 @@ DECLARE
 	__vnum bigint;
 	__dbaction smallint;
 	__inserted_oid bigint;
+	_resdesc_jsonb JSONB;
 BEGIN
+	begin
+		_resdesc_jsonb := _resdesc::jsonb;
+		exception
+			when others then
+        		raise exception 'Invalid JSON string: %', _resdesc;
+	end;
+
 	begin
 		select oid, vnum, dbaction into __resoid, __vnum, __dbaction from stsresource r where r.resname = _resname and r.validto is null;
 		-- Too many records exists using the supplied data, the database is in an invalid state for this resource
@@ -597,8 +114,8 @@ BEGIN
 			update stsresource set validto = __now where oid = __resoid;
 
 			-- Create a new record
-			insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-			values (_resname, _resdesc, __vnum+1, 1, _dbactionuser, __now)
+			insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+			values (_resname, _resdesc, _resdesc_jsonb, __vnum+1, 1, _dbactionuser, __now)
 			returning oid into __inserted_oid;
 
 			return query
@@ -618,8 +135,8 @@ BEGIN
 		returning *;
 		*/
 
-		insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		values (_resname, _resdesc, 1, 1, _dbactionuser, __now)
+		insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (_resname, _resdesc, _resdesc_jsonb, 1, 1, _dbactionuser, __now)
 		returning oid into __inserted_oid;
 
 		return query
@@ -632,17 +149,16 @@ ALTER FUNCTION public.create_stsresource(character varying, character varying, c
     OWNER TO postgres;
 
 
--- FUNCTION: public.delete_stsentity(character varying, character varying, integer, character varying, integer)
 
--- DROP FUNCTION public.delete_stsentity(character varying, character varying, integer, character varying, integer);
 
-CREATE OR REPLACE FUNCTION public.delete_stsentity(
+
+
+CREATE OR REPLACE FUNCTION public.update_stsresource(
 	_dbactionuser character varying,
 	_resname character varying,
 	_resvnum integer,
-	_entname character varying,
-	_entvnum integer)
-    RETURNS SETOF stsentity 
+	_resdesc character varying)
+    RETURNS SETOF stsresource 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -653,59 +169,121 @@ AS $BODY$
 declare 
 	_now timestamp without time zone := now();
 	resoid bigint;
-	entoid bigint;
-	__inserted_oid bigint;
+	newresoid stsresource.oid%TYPE;
+	_resdesc_jsonb JSONB;
 BEGIN
-	BEGIN
-		-- Ensure we get the current non-deleted resource.
+	begin
+		_resdesc_jsonb := _resdesc::jsonb;
+		exception
+			when others then
+        		raise exception 'Invalid JSON string: %', _resdesc;
+	end;
+
+	begin
 		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
 	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
-	END;
+	end;
+	
 	if resoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
         RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
 
-	-- Ensure we get the current non-deleted entity for this resource.
+	update stsresource set validto = _now where oid = resoid;
+
+	insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (_resname, _resdesc, _resdesc_jsonb, _resvnum+1, 2, _dbactionuser, _now)
+	RETURNING oid INTO newresoid;
+	
+	update stsentity set resourceoid = newresoid where resourceoid = resoid;
+	
+	return query
+	select * from stsresource where oid = newresoid;
+END;
+$BODY$;
+
+ALTER FUNCTION public.update_stsresource(character varying, character varying, integer, character varying)
+    OWNER TO postgres;
+
+
+-- FUNCTION: public.update_stsresource(character varying, character varying, integer, character varying)
+
+-- DROP FUNCTION public.update_stsresource(character varying, character varying, integer, character varying);
+
+CREATE OR REPLACE FUNCTION public.update_stsresource_latest(
+	_dbactionuser character varying,
+	_resname character varying,
+	_resdesc character varying)
+    RETURNS SETOF stsresource 
+    LANGUAGE 'plpgsql'
+
+    COST 100
+    VOLATILE 
+    ROWS 1000
+    
+AS $BODY$
+declare 
+	_now timestamp without time zone := now();
+	resoid bigint;
+	newresoid stsresource.oid%TYPE;
+	_resvnum integer;
+	_resdesc_jsonb JSONB;
+BEGIN
 	begin
-		entoid = (select oid from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.vnum = _entvnum and e.validto is null and e.dbaction != 3);
+		_resdesc_jsonb := _resdesc::jsonb;
+		exception
+			when others then
+        		raise exception 'Invalid JSON string: %', _resdesc;
+	end;
+
+	begin
+		_resvnum := (select vnum from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
+	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
 	end;
 
-	if entoid is null then
+	begin
+		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
+		exception
+			when sqlstate '21000' then 
+	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
+	end;
+
+	if resoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'entname and version not found or not current version (not deleted) within stsentity %', _entname USING ERRCODE = 'no_data_found';
+        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
 
-	update stsentity set validto = _now where oid = entoid;
-		
-	insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		(select resoid, e.entname, e.entvalue, _entvnum+1, 3, _dbactionuser, _now
-			from stsentity e where e.oid = entoid)
-	returning oid into __inserted_oid;
+	update stsresource set validto = _now where oid = resoid;
 
+	insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (_resname, _resdesc, _resdesc_jsonb, _resvnum+1, 2, _dbactionuser, _now)
+	RETURNING oid INTO newresoid;
+	
+	update stsentity set resourceoid = newresoid where resourceoid = resoid;
+	
 	return query
-	select * from stsentity where oid = __inserted_oid;
+	select * from stsresource where oid = newresoid;
 END;
 $BODY$;
 
-ALTER FUNCTION public.delete_stsentity(character varying, character varying, integer, character varying, integer)
+ALTER FUNCTION public.update_stsresource_latest(character varying, character varying, character varying)
     OWNER TO postgres;
 
 
 
+-- FUNCTION: public.delete_stsresource(character varying, character varying, integer)
 
+-- DROP FUNCTION public.delete_stsresource(character varying, character varying, integer);
 
-
-CREATE OR REPLACE FUNCTION public.delete_stsentity_latest(
+CREATE OR REPLACE FUNCTION public.delete_stsresource(
 	_dbactionuser character varying,
 	_resname character varying,
-	_entname character varying)
-    RETURNS SETOF stsentity 
+	_resvnum integer)
+    RETURNS SETOF stsresource 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -716,66 +294,150 @@ AS $BODY$
 declare 
 	_now timestamp without time zone := now();
 	resoid bigint;
-	entoid bigint;
-	__inserted_oid bigint;
-	_entvnum integer;
+	newresoid stsresource.oid%TYPE;
 BEGIN
-	BEGIN
-		-- Ensure we get the current non-deleted resource.
-		resoid := (select oid from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
+	begin
+		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
 	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
-	END;
+	end;
+
 	if resoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
+        RAISE 'resname and version not found or not current version within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
 
+	update stsresource set validto = _now where oid = resoid;
+
+	insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		select r.resname, r.resdesc, r.resdesc::jsonb, _resvnum+1, 3, _dbactionuser, _now
+			from stsresource r where r.oid = resoid
+	RETURNING oid INTO newresoid;
+	
+	update stsentity set resourceoid = newresoid where resourceoid = resoid;
+	
+	return query
+		select * from stsresource where oid = newresoid;
+END;
+$BODY$;
+
+ALTER FUNCTION public.delete_stsresource(character varying, character varying, integer)
+    OWNER TO postgres;
+
+
+
+CREATE OR REPLACE FUNCTION public.delete_stsresource_latest(
+	_dbactionuser character varying,
+	_resname character varying)
+    RETURNS SETOF stsresource 
+    LANGUAGE 'plpgsql'
+
+    COST 100
+    VOLATILE 
+    ROWS 1000
+    
+AS $BODY$
+declare 
+	_now timestamp without time zone := now();
+	resoid bigint;
+	newresoid stsresource.oid%TYPE;
+	_resvnum integer;
+BEGIN
 	begin
-		_entvnum = (select vnum from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3);
+		_resvnum := (select vnum from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
+	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
 	end;
 
-	-- Ensure we get the current non-deleted entity for this resource.
 	begin
-		entoid = (select oid from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.vnum = _entvnum and e.validto is null and e.dbaction != 3);
+		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
+	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
 	end;
 
-	if entoid is null then
+	if resoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'entname and version not found or not current version (not deleted) within stsentity %', _entname USING ERRCODE = 'no_data_found';
+        RAISE 'resname and version not found or not current version within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
 
-	update stsentity set validto = _now where oid = entoid;
-		
-	insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		(select resoid, e.entname, e.entvalue, _entvnum+1, 3, _dbactionuser, _now
-			from stsentity e where e.oid = entoid)
-	returning oid into __inserted_oid;
+	update stsresource set validto = _now where oid = resoid;
+
+	insert into stsresource(resname, resdesc, resdesc_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		select r.resname, r.resdesc, r.resdesc::jsonb, _resvnum+1, 3, _dbactionuser, _now
+			from stsresource r where r.oid = resoid
+	RETURNING oid INTO newresoid;
+	
+	update stsentity set resourceoid = newresoid where resourceoid = resoid;
+	
+	return query
+		select * from stsresource where oid = newresoid;
+END;
+$BODY$;
+
+ALTER FUNCTION public.delete_stsresource_latest(character varying, character varying)
+    OWNER TO postgres;
+
+
+-- Table: public.stsentity
+
+-- DROP TABLE public.stsentity;
+
+CREATE TABLE public.stsentity
+(
+    oid bigint NOT NULL DEFAULT nextval('stsentity_oid_seq'::regclass),
+    resourceoid integer NOT NULL,
+    entname character varying(128) COLLATE pg_catalog."default" NOT NULL,
+    entvalue character varying(32768) COLLATE pg_catalog."default",
+	envalue_jsonb jsonb,
+    vnum bigint NOT NULL,
+    validfrom timestamp without time zone NOT NULL,
+    validto timestamp without time zone,
+    dbaction smallint NOT NULL,
+    dbactionuser character varying(64) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT stsentity_pkey PRIMARY KEY (oid),
+    CONSTRAINT fk_stsresource FOREIGN KEY (resourceoid)
+        REFERENCES public.stsresource (oid) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE CASCADE
+)
+TABLESPACE pg_default;
+
+ALTER TABLE public.stsentity
+    OWNER to postgres;
+
+-- Index: stsentity_resourceoid_entname_vnum
 
-	return query
-	select * from stsentity where oid = __inserted_oid;
-END;
-$BODY$;
+-- DROP INDEX public.stsentity_resourceoid_entname_vnum;
 
-ALTER FUNCTION public.delete_stsentity_latest(character varying, character varying, character varying)
-    OWNER TO postgres;
+CREATE UNIQUE INDEX stsentity_resourceoid_entname_vnum
+    ON public.stsentity USING btree
+    (resourceoid ASC NULLS LAST, entname COLLATE pg_catalog."default" ASC NULLS LAST, vnum ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- Index: stsentity_resourceoid_entname_validto
 
+-- DROP INDEX public.stsentity_resourceoid_entname_validto;
 
+CREATE INDEX stsentity_resourceoid_entname_validto
+    ON public.stsentity USING btree
+    (resourceoid ASC NULLS LAST, entname COLLATE pg_catalog."default" ASC NULLS LAST, validto DESC NULLS LAST)
+    TABLESPACE pg_default;
 
 
+-- FUNCTION: public.create_stsentity(character varying, character varying, integer, character varying, character varying)
 
+-- DROP FUNCTION public.create_stsentity(character varying, character varying, integer, character varying, character varying);
 
-CREATE OR REPLACE FUNCTION public.delete_stsresource_latest(
+CREATE OR REPLACE FUNCTION public.create_stsentity(
 	_dbactionuser character varying,
-	_resname character varying)
-    RETURNS SETOF stsresource 
+	_resname character varying,
+	_resvnum integer,
+	_entname character varying,
+	_entvalue character varying)
+    RETURNS SETOF stsentity 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -783,59 +445,52 @@ CREATE OR REPLACE FUNCTION public.delete_stsresource_latest(
     ROWS 1000
     
 AS $BODY$
-declare 
-	_now timestamp without time zone := now();
+declare
 	resoid bigint;
-	newresoid stsresource.oid%TYPE;
-	_resvnum integer;
+	__inserted_oid bigint;
+	_envalue_jsonb JSONB;
 BEGIN
 	begin
-		_resvnum := (select vnum from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
-		exception
-			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
-	end;
-
-	begin
-		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
+		_envalue_jsonb := _entvalue::jsonb;
 		exception
-			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
+			when others then
+        		raise exception 'Invalid JSON string: %', _entvalue;
 	end;
 
+	-- Ensure we get the current non-deleted resource.
+	resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
 	if resoid is null then
-        -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'resname and version not found or not current version within stsresource %', _resname USING ERRCODE = 'no_data_found';
+ 		-- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+	        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
+	if (select count(*) from stsentity e 
+		where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3) > 0 then
+	    -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+	    -- RAISE EXCEPTION 'resname already exists within stsresource %', now();
+        RAISE 'Duplicate entname within stsresource: %', _resname USING ERRCODE = 'unique_violation';
+	else
+		insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (resoid, _entname, _entvalue, _envalue_jsonb, 1, 1, _dbactionuser, now())
+		returning oid into __inserted_oid;
 
-	update stsresource set validto = _now where oid = resoid;
-
-	insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		select r.resname, r.resdesc, _resvnum+1, 3, _dbactionuser, _now
-			from stsresource r where r.oid = resoid
-	RETURNING oid INTO newresoid;
-	
-	update stsentity set resourceoid = newresoid where resourceoid = resoid;
-	
-	return query
-		select * from stsresource where oid = newresoid;
+		return query
+		select * from stsentity where oid = __inserted_oid;
+    END IF;
 END;
 $BODY$;
 
-ALTER FUNCTION public.delete_stsresource_latest(character varying, character varying)
+ALTER FUNCTION public.create_stsentity(character varying, character varying, integer, character varying, character varying)
     OWNER TO postgres;
 
 
 
--- FUNCTION: public.delete_stsresource(character varying, character varying, integer)
-
--- DROP FUNCTION public.delete_stsresource(character varying, character varying, integer);
 
-CREATE OR REPLACE FUNCTION public.delete_stsresource(
+CREATE OR REPLACE FUNCTION public.create_stsentity_latest(
 	_dbactionuser character varying,
 	_resname character varying,
-	_resvnum integer)
-    RETURNS SETOF stsresource 
+	_entname character varying,
+	_entvalue character varying)
+    RETURNS SETOF stsentity 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -843,41 +498,45 @@ CREATE OR REPLACE FUNCTION public.delete_stsresource(
     ROWS 1000
     
 AS $BODY$
-declare 
-	_now timestamp without time zone := now();
+declare
 	resoid bigint;
-	newresoid stsresource.oid%TYPE;
+	__inserted_oid bigint;
+	_envalue_jsonb JSONB;
 BEGIN
 	begin
-		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
+		_envalue_jsonb := _entvalue::jsonb;
 		exception
-			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
+			when others then
+        		raise exception 'Invalid JSON string: %', _entvalue;
 	end;
 
+	-- Ensure we get the current non-deleted resource.
+	resoid := (select oid from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
 	if resoid is null then
-        -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'resname and version not found or not current version within stsresource %', _resname USING ERRCODE = 'no_data_found';
+ 		-- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+	        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
+	if (select count(*) from stsentity e 
+		where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3) > 0 then
+	    -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+	    -- RAISE EXCEPTION 'resname already exists within stsresource %', now();
+        RAISE 'Duplicate entname within stsresource: %', _resname USING ERRCODE = 'unique_violation';
+	else
+		insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (resoid, _entname, _entvalue, _envalue_jsonb, 1, 1, _dbactionuser, now())
+		returning oid into __inserted_oid;
 
-	update stsresource set validto = _now where oid = resoid;
-
-	insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		select r.resname, r.resdesc, _resvnum+1, 3, _dbactionuser, _now
-			from stsresource r where r.oid = resoid
-	RETURNING oid INTO newresoid;
-	
-	update stsentity set resourceoid = newresoid where resourceoid = resoid;
-	
-	return query
-		select * from stsresource where oid = newresoid;
+		return query
+		select * from stsentity where oid = __inserted_oid;
+    END IF;
 END;
 $BODY$;
 
-ALTER FUNCTION public.delete_stsresource(character varying, character varying, integer)
+ALTER FUNCTION public.create_stsentity_latest(character varying, character varying, character varying, character varying)
     OWNER TO postgres;
 
 
+
 -- FUNCTION: public.update_stsentity(character varying, character varying, integer, character varying, integer, character varying)
 
 -- DROP FUNCTION public.update_stsentity(character varying, character varying, integer, character varying, integer, character varying);
@@ -902,7 +561,15 @@ declare
 	resoid bigint;
 	entoid bigint;
 	__inserted_oid bigint;
+	_envalue_jsonb JSONB;
 BEGIN
+	begin
+		_envalue_jsonb := _entvalue::jsonb;
+		exception
+			when others then
+				raise exception 'Invalid JSON string: %', _entvalue;
+	end;
+
 	BEGIN
 		-- Ensure we get the current non-deleted resource.
 		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
@@ -930,8 +597,8 @@ BEGIN
 
 	update stsentity set validto = _now where oid = entoid;
 		
-	insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		values (resoid, _entname, _entvalue, _entvnum+1, 2, _dbactionuser, _now)
+	insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (resoid, _entname, _entvalue, _envalue_jsonb, _entvnum+1, 2, _dbactionuser, _now)
 	returning oid into __inserted_oid;
 
 	return query
@@ -965,7 +632,15 @@ declare
 	entoid bigint;
 	__inserted_oid bigint;
 	_entvnum integer;
+	_envalue_jsonb JSONB;
 BEGIN
+	begin
+		_envalue_jsonb := _entvalue::jsonb;
+		exception
+			when others then
+        		raise exception 'Invalid JSON string: %', _entvalue;
+	end;
+
 	BEGIN
 		-- Ensure we get the current non-deleted resource.
 		resoid := (select oid from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
@@ -1000,8 +675,8 @@ BEGIN
 
 	update stsentity set validto = _now where oid = entoid;
 		
-	insert into stsentity(resourceoid, entname, entvalue, vnum, dbaction, dbactionuser, validfrom)
-		values (resoid, _entname, _entvalue, _entvnum+1, 2, _dbactionuser, _now)
+	insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		values (resoid, _entname, _entvalue, _envalue_jsonb, _entvnum+1, 2, _dbactionuser, _now)
 	returning oid into __inserted_oid;
 
 	return query
@@ -1013,16 +688,17 @@ ALTER FUNCTION public.update_stsentity_latest(character varying, character varyi
     OWNER TO postgres;
 
 
+-- FUNCTION: public.delete_stsentity(character varying, character varying, integer, character varying, integer)
 
--- FUNCTION: public.update_stsresource(character varying, character varying, integer, character varying)
-
--- DROP FUNCTION public.update_stsresource(character varying, character varying, integer, character varying);
+-- DROP FUNCTION public.delete_stsentity(character varying, character varying, integer, character varying, integer);
 
-CREATE OR REPLACE FUNCTION public.update_stsresource_latest(
+CREATE OR REPLACE FUNCTION public.delete_stsentity(
 	_dbactionuser character varying,
 	_resname character varying,
-	_resdesc character varying)
-    RETURNS SETOF stsresource 
+	_resvnum integer,
+	_entname character varying,
+	_entvnum integer)
+    RETURNS SETOF stsentity 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -1033,53 +709,59 @@ AS $BODY$
 declare 
 	_now timestamp without time zone := now();
 	resoid bigint;
-	newresoid stsresource.oid%TYPE;
-	_resvnum integer;
+	entoid bigint;
+	__inserted_oid bigint;
 BEGIN
-	begin
-		_resvnum := (select vnum from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
+	BEGIN
+		-- Ensure we get the current non-deleted resource.
+		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
 	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
-	end;
+	END;
+	if resoid is null then
+        -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
+	end if;
 
+	-- Ensure we get the current non-deleted entity for this resource.
 	begin
-		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
+		entoid = (select oid from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.vnum = _entvnum and e.validto is null and e.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
-	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
+	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
 	end;
 
-	if resoid is null then
+	if entoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
-        RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
+        RAISE 'entname and version not found or not current version (not deleted) within stsentity %', _entname USING ERRCODE = 'no_data_found';
 	end if;
 
-	update stsresource set validto = _now where oid = resoid;
+	update stsentity set validto = _now where oid = entoid;
+		
+	insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		(select resoid, e.entname, e.entvalue, e.entvalue::jsonb, _entvnum+1, 3, _dbactionuser, _now
+			from stsentity e where e.oid = entoid)
+	returning oid into __inserted_oid;
 
-	insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		values (_resname, _resdesc, _resvnum+1, 2, _dbactionuser, _now)
-	RETURNING oid INTO newresoid;
-	
-	update stsentity set resourceoid = newresoid where resourceoid = resoid;
-	
 	return query
-	select * from stsresource where oid = newresoid;
+	select * from stsentity where oid = __inserted_oid;
 END;
 $BODY$;
 
-ALTER FUNCTION public.update_stsresource_latest(character varying, character varying, character varying)
+ALTER FUNCTION public.delete_stsentity(character varying, character varying, integer, character varying, integer)
     OWNER TO postgres;
 
 
 
 
-CREATE OR REPLACE FUNCTION public.update_stsresource(
+
+
+CREATE OR REPLACE FUNCTION public.delete_stsentity_latest(
 	_dbactionuser character varying,
 	_resname character varying,
-	_resvnum integer,
-	_resdesc character varying)
-    RETURNS SETOF stsresource 
+	_entname character varying)
+    RETURNS SETOF stsentity 
     LANGUAGE 'plpgsql'
 
     COST 100
@@ -1090,397 +772,55 @@ AS $BODY$
 declare 
 	_now timestamp without time zone := now();
 	resoid bigint;
-	newresoid stsresource.oid%TYPE;
+	entoid bigint;
+	__inserted_oid bigint;
+	_entvnum integer;
 BEGIN
-	begin
-		resoid := (select oid from stsresource r where r.resname = _resname and r.vnum = _resvnum and r.validto is null and r.dbaction != 3);
+	BEGIN
+		-- Ensure we get the current non-deleted resource.
+		resoid := (select oid from stsresource r where r.resname = _resname and r.validto is null and r.dbaction != 3);
 		exception
 			when sqlstate '21000' then 
 	    	  raise exception 'Too many stsresource records for current version using stsresource %', _resname USING ERRCODE = 'cardinality_violation';
-	end;
-	
+	END;
 	if resoid is null then
         -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
         RAISE 'resname and version not found or not current version (not deleted) within stsresource %', _resname USING ERRCODE = 'no_data_found';
 	end if;
 
-	update stsresource set validto = _now where oid = resoid;
-
-	insert into stsresource(resname, resdesc, vnum, dbaction, dbactionuser, validfrom)
-		values (_resname, _resdesc, _resvnum+1, 2, _dbactionuser, _now)
-	RETURNING oid INTO newresoid;
-	
-	update stsentity set resourceoid = newresoid where resourceoid = resoid;
-	
-	return query
-	select * from stsresource where oid = newresoid;
-END;
-$BODY$;
-
-ALTER FUNCTION public.update_stsresource(character varying, character varying, integer, character varying)
-    OWNER TO postgres;
-
-
---- [ Queries ] ------------------------------------------------------------------------------------
-
--- DROP FUNCTION get_monitor_summary()
--- select * from get_monitor_summary()
--- Shows all services currently running
-CREATE OR REPLACE FUNCTION public.get_monitor_summary()
-	RETURNS TABLE 
-		(serviceid character varying,
-		request_count_gauge integer,
-		error_count_gauge integer,
-		retry_count_gauge integer,
-		authentication_count_gauge integer,
-		velocity_gauge numeric,
-		cpu_load_gauge numeric,
-		active_request_gauge integer,
-		connection_count_gauge integer,
-		connection_pool_total_gauge integer,
-		connection_pool_idle_gauge integer,
-		connection_pool_waiting_gauge integer,
-		core_count_gauge integer,
-		timer_gauge numeric,
-		duration_gauge numeric,
-		latency_gauge numeric,
-		duration_histogram_gauge_1 integer,
-		duration_histogram_gauge_2 integer,
-		duration_histogram_gauge_3 integer,
-		duration_histogram_gauge_4 integer,
-		duration_histogram_gauge_5 integer,
-		duration_histogram_gauge_6 integer,
-		duration_histogram_gauge_7 integer,
-		latency_histogram_gauge_1 integer,
-		latency_histogram_gauge_2 integer,
-		latency_histogram_gauge_3 integer,
-		latency_histogram_gauge_4 integer,
-		latency_histogram_gauge_5 integer,
-		latency_histogram_gauge_6 integer,
-		latency_histogram_gauge_7 integer)
-	LANGUAGE 'plpgsql'
-AS $$
-BEGIN
--- Show all services
--- Top level query
-	RETURN QUERY
-	select
-		'_'::character varying as serviceid,
-		sum(m.request_count_gauge)::integer as request_count_gauge,
-		sum(m.error_count_gauge)::integer as error_count_gauge,
-		sum(m.retry_count_gauge)::integer as retry_count_gauge,
-		sum(m.authentication_count_gauge)::integer as authentication_count_gauge,
-		sum(m.velocity_gauge)::numeric as velocity_gauge,
-		sum(m.cpu_load_gauge)::numeric as cpu_load_gauge,
-		sum(m.active_request_gauge)::integer as active_request_gauge,
-		sum(m.connection_count_gauge)::integer as connection_count_gauge,
-		sum(m.connection_pool_total_gauge)::integer as connection_pool_total_gauge,
-		sum(m.connection_pool_idle_gauge)::integer as connection_pool_idle_gauge,
-		sum(m.connection_pool_waiting_gauge)::integer as connection_pool_waiting_gauge,
-		sum(m.core_count_gauge)::integer as core_count_gauge,
-		avg(m.timer_gauge)::numeric as timer_gauge, -- needs to be raw
-		avg(m.duration_gauge)::numeric as duration_gauge,
-		avg(m.latency_gauge)::numeric as latency_gauge,
-		sum(m.duration_histogram_gauge[1])::integer as duration_histogram_gauge_1,
-		sum(m.duration_histogram_gauge[2])::integer as duration_histogram_gauge_2,
-		sum(m.duration_histogram_gauge[3])::integer as duration_histogram_gauge_3,
-		sum(m.duration_histogram_gauge[4])::integer as duration_histogram_gauge_4,
-		sum(m.duration_histogram_gauge[5])::integer as duration_histogram_gauge_5,
-		sum(m.duration_histogram_gauge[6])::integer as duration_histogram_gauge_6,
-		sum(m.duration_histogram_gauge[7])::integer as duration_histogram_gauge_7,
-		sum(m.latency_histogram_gauge[1])::integer as latency_histogram_gauge_1,
-		sum(m.latency_histogram_gauge[2])::integer as latency_histogram_gauge_2,
-		sum(m.latency_histogram_gauge[3])::integer as latency_histogram_gauge_3,
-		sum(m.latency_histogram_gauge[4])::integer as latency_histogram_gauge_4,
-		sum(m.latency_histogram_gauge[5])::integer as latency_histogram_gauge_5,
-		sum(m.latency_histogram_gauge[6])::integer as latency_histogram_gauge_6,
-		sum(m.latency_histogram_gauge[7])::integer as latency_histogram_gauge_7
-	from stsmonitor m;
-END
-$$;
-
-ALTER FUNCTION public.get_monitor_summary()
-    OWNER TO postgres;
-
+	begin
+		_entvnum = (select vnum from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.validto is null and e.dbaction != 3);
+		exception
+			when sqlstate '21000' then 
+	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
+	end;
 
--- DROP FUNCTION get_monitor_summary()
--- select * from get_monitor_summary()
--- Shows all services currently running
-CREATE OR REPLACE FUNCTION public.get_monitor_service_summary()
-	RETURNS TABLE 
-		(serviceid character varying,
-		request_count_gauge integer,
-		error_count_gauge integer,
-		retry_count_gauge integer,
-		authentication_count_gauge integer,
-		velocity_gauge numeric,
-		cpu_load_gauge numeric,
-		active_request_gauge integer,
-		connection_count_gauge integer,
-		connection_pool_total_gauge integer,
-		connection_pool_idle_gauge integer,
-		connection_pool_waiting_gauge integer,
-		core_count_gauge integer,
-		timer_gauge numeric,
-		duration_gauge numeric,
-		latency_gauge numeric,
-		duration_histogram_gauge_1 integer,
-		duration_histogram_gauge_2 integer,
-		duration_histogram_gauge_3 integer,
-		duration_histogram_gauge_4 integer,
-		duration_histogram_gauge_5 integer,
-		duration_histogram_gauge_6 integer,
-		duration_histogram_gauge_7 integer,
-		latency_histogram_gauge_1 integer,
-		latency_histogram_gauge_2 integer,
-		latency_histogram_gauge_3 integer,
-		latency_histogram_gauge_4 integer,
-		latency_histogram_gauge_5 integer,
-		latency_histogram_gauge_6 integer,
-		latency_histogram_gauge_7 integer)
-	LANGUAGE 'plpgsql'
-AS $$
-BEGIN
--- Show all services
--- Top level query
-	RETURN QUERY
-	select
-		m.serviceid,
-		sum(m.request_count_gauge)::integer as request_count_gauge,
-		sum(m.error_count_gauge)::integer as error_count_gauge,
-		sum(m.retry_count_gauge)::integer as retry_count_gauge,
-		sum(m.authentication_count_gauge)::integer as authentication_count_gauge,
-		sum(m.velocity_gauge)::numeric as velocity_gauge,
-		sum(m.cpu_load_gauge)::numeric as cpu_load_gauge,
-		sum(m.active_request_gauge)::integer as active_request_gauge,
-		sum(m.connection_count_gauge)::integer as connection_count_gauge,
-		sum(m.connection_pool_total_gauge)::integer as connection_pool_total_gauge,
-		sum(m.connection_pool_idle_gauge)::integer as connection_pool_idle_gauge,
-		sum(m.connection_pool_waiting_gauge)::integer as connection_pool_waiting_gauge,
-		sum(m.core_count_gauge)::integer as core_count_gauge,
-		avg(m.timer_gauge)::numeric as timer_gauge, -- needs to be raw
-		avg(m.duration_gauge)::numeric as duration_gauge,
-		avg(m.latency_gauge)::numeric as latency_gauge,
-		sum(m.duration_histogram_gauge[1])::integer as duration_histogram_gauge_1,
-		sum(m.duration_histogram_gauge[2])::integer as duration_histogram_gauge_2,
-		sum(m.duration_histogram_gauge[3])::integer as duration_histogram_gauge_3,
-		sum(m.duration_histogram_gauge[4])::integer as duration_histogram_gauge_4,
-		sum(m.duration_histogram_gauge[5])::integer as duration_histogram_gauge_5,
-		sum(m.duration_histogram_gauge[6])::integer as duration_histogram_gauge_6,
-		sum(m.duration_histogram_gauge[7])::integer as duration_histogram_gauge_7,
-		sum(m.latency_histogram_gauge[1])::integer as latency_histogram_gauge_1,
-		sum(m.latency_histogram_gauge[2])::integer as latency_histogram_gauge_2,
-		sum(m.latency_histogram_gauge[3])::integer as latency_histogram_gauge_3,
-		sum(m.latency_histogram_gauge[4])::integer as latency_histogram_gauge_4,
-		sum(m.latency_histogram_gauge[5])::integer as latency_histogram_gauge_5,
-		sum(m.latency_histogram_gauge[6])::integer as latency_histogram_gauge_6,
-		sum(m.latency_histogram_gauge[7])::integer as latency_histogram_gauge_7
-	from stsmonitor m
-	group by m.serviceid
-	order by m.serviceid;
-END
-$$;
-
-ALTER FUNCTION public.get_monitor_service_summary()
-    OWNER TO postgres;
+	-- Ensure we get the current non-deleted entity for this resource.
+	begin
+		entoid = (select oid from stsentity e where e.resourceoid = resoid and e.entname = _entname and e.vnum = _entvnum and e.validto is null and e.dbaction != 3);
+		exception
+			when sqlstate '21000' then 
+	    	  raise exception 'Too many stsentity records for current version using stsentity %', _entname USING ERRCODE = 'cardinality_violation';
+	end;
 
+	if entoid is null then
+        -- Exception Codes: https://www.postgresql.org/docs/10/errcodes-appendix.html
+        RAISE 'entname and version not found or not current version (not deleted) within stsentity %', _entname USING ERRCODE = 'no_data_found';
+	end if;
 
--- DROP FUNCTION get_monitor_summary_by_serviceid()
--- select * from get_monitor_summary()
--- select * from get_monitor_summary_by_serviceid('STSAuth@1.0.0')
--- Shows all instances for this serviceid
-CREATE OR REPLACE FUNCTION public.get_monitor_summary_by_serviceid(
-	_serviceid character varying)
-	RETURNS TABLE 
-		(serviceid character varying,
-		serviceinstanceid character varying,
-		request_count_gauge integer,
-		error_count_gauge integer,
-		retry_count_gauge integer,
-		authentication_count_gauge integer,
-		velocity_gauge numeric,
-		cpu_load_gauge numeric,
-		active_request_gauge integer,
-		connection_count_gauge integer,
-		connection_pool_total_gauge integer,
-		connection_pool_idle_gauge integer,
-		connection_pool_waiting_gauge integer,
-		core_count_gauge integer,
-		timer_gauge numeric,
-		duration_gauge numeric,
-		latency_gauge numeric,
-		duration_histogram_gauge_1 integer,
-		duration_histogram_gauge_2 integer,
-		duration_histogram_gauge_3 integer,
-		duration_histogram_gauge_4 integer,
-		duration_histogram_gauge_5 integer,
-		duration_histogram_gauge_6 integer,
-		duration_histogram_gauge_7 integer,
-		latency_histogram_gauge_1 integer,
-		latency_histogram_gauge_2 integer,
-		latency_histogram_gauge_3 integer,
-		latency_histogram_gauge_4 integer,
-		latency_histogram_gauge_5 integer,
-		latency_histogram_gauge_6 integer,
-		latency_histogram_gauge_7 integer)
-	LANGUAGE 'plpgsql'
-AS $$
-BEGIN
--- Show all services
--- Top level query
-	RETURN QUERY
-	select
-		m.serviceid,
-		m.serviceinstanceid,
-		sum(m.request_count_gauge)::integer as request_count_gauge,
-		sum(m.error_count_gauge)::integer as error_count_gauge,
-		sum(m.retry_count_gauge)::integer as retry_count_gauge,
-		sum(m.authentication_count_gauge)::integer as authentication_count_gauge,
-		sum(m.velocity_gauge)::numeric as velocity_gauge,
-		sum(m.cpu_load_gauge)::numeric as cpu_load_gauge,
-		sum(m.active_request_gauge)::integer as active_request_gauge,
-		sum(m.connection_count_gauge)::integer as connection_count_gauge,
-		sum(m.connection_pool_total_gauge)::integer as connection_pool_total_gauge,
-		sum(m.connection_pool_idle_gauge)::integer as connection_pool_idle_gauge,
-		sum(m.connection_pool_waiting_gauge)::integer as connection_pool_waiting_gauge,
-		sum(m.core_count_gauge)::integer as core_count_gauge,
-		avg(m.timer_gauge)::numeric as timer_gauge, -- needs to be raw
-		avg(m.duration_gauge)::numeric as duration_gauge,
-		avg(m.latency_gauge)::numeric as latency_gauge,
-		sum(m.duration_histogram_gauge[1])::integer as duration_histogram_gauge_1,
-		sum(m.duration_histogram_gauge[2])::integer as duration_histogram_gauge_2,
-		sum(m.duration_histogram_gauge[3])::integer as duration_histogram_gauge_3,
-		sum(m.duration_histogram_gauge[4])::integer as duration_histogram_gauge_4,
-		sum(m.duration_histogram_gauge[5])::integer as duration_histogram_gauge_5,
-		sum(m.duration_histogram_gauge[6])::integer as duration_histogram_gauge_6,
-		sum(m.duration_histogram_gauge[7])::integer as duration_histogram_gauge_7,
-		sum(m.latency_histogram_gauge[1])::integer as latency_histogram_gauge_1,
-		sum(m.latency_histogram_gauge[2])::integer as latency_histogram_gauge_2,
-		sum(m.latency_histogram_gauge[3])::integer as latency_histogram_gauge_3,
-		sum(m.latency_histogram_gauge[4])::integer as latency_histogram_gauge_4,
-		sum(m.latency_histogram_gauge[5])::integer as latency_histogram_gauge_5,
-		sum(m.latency_histogram_gauge[6])::integer as latency_histogram_gauge_6,
-		sum(m.latency_histogram_gauge[7])::integer as latency_histogram_gauge_7
-	from stsmonitor m
-	group by m.serviceid, m.serviceinstanceid
-	having m.serviceid = _serviceid
-	order by m.serviceid, m.serviceinstanceid;
-END
-$$;
-
-ALTER FUNCTION public.get_monitor_summary_by_serviceid(character varying)
-    OWNER TO postgres;
+	update stsentity set validto = _now where oid = entoid;
+		
+	insert into stsentity(resourceoid, entname, entvalue, envalue_jsonb, vnum, dbaction, dbactionuser, validfrom)
+		(select resoid, e.entname, e.entvalue, e.entvalue::jsonb, _entvnum+1, 3, _dbactionuser, _now
+			from stsentity e where e.oid = entoid)
+	returning oid into __inserted_oid;
 
+	return query
+	select * from stsentity where oid = __inserted_oid;
+END;
+$BODY$;
 
--- select * from stsmonitor where serviceinstanceid = 'e2a83340-7b0b-4283-be67-d43ff110bfd3@12900k-14-91'
--- DROP FUNCTION get_monitor_summary_by_serviceinstanceid
--- select * from get_monitor_summary()
--- select * from get_monitor_summary_by_serviceid('STSAuth@1.0.0')
--- select * from get_monitor_summary_by_serviceinstanceid('e2a83340-7b0b-4283-be67-d43ff110bfd3@12900k-14-91')
--- Shows all threads for this service instance id
-CREATE OR REPLACE FUNCTION public.get_monitor_summary_by_serviceinstanceid(
-	_serviceinstanceid character varying)
-	RETURNS TABLE 
-		(serviceid character varying,
-		serviceinstanceid character varying,
-		pid integer,
-		ppid integer,
-		request_count_gauge integer,
-		error_count_gauge integer,
-		retry_count_gauge integer,
-		authentication_count_gauge integer,
-		velocity_gauge numeric,
-		cpu_load_gauge numeric,
-		active_request_gauge integer,
-		connection_count_gauge integer,
-		connection_pool_total_gauge integer,
-		connection_pool_idle_gauge integer,
-		connection_pool_waiting_gauge integer,
-		core_count_gauge integer,
-		timer_gauge numeric,
-		duration_gauge numeric,
-		latency_gauge numeric,
-		duration_histogram_gauge_1 integer,
-		duration_histogram_gauge_2 integer,
-		duration_histogram_gauge_3 integer,
-		duration_histogram_gauge_4 integer,
-		duration_histogram_gauge_5 integer,
-		duration_histogram_gauge_6 integer,
-		duration_histogram_gauge_7 integer,
-		latency_histogram_gauge_1 integer,
-		latency_histogram_gauge_2 integer,
-		latency_histogram_gauge_3 integer,
-		latency_histogram_gauge_4 integer,
-		latency_histogram_gauge_5 integer,
-		latency_histogram_gauge_6 integer,
-		latency_histogram_gauge_7 integer)
-	LANGUAGE 'plpgsql'
-AS $$
-BEGIN
--- Show all services
--- Top level query
-	RETURN QUERY
-	select
-		m.serviceid,
-		m.serviceinstanceid,
-		m.pid,
-		m.ppid,
-		sum(m.request_count_gauge)::integer as request_count_gauge,
-		sum(m.error_count_gauge)::integer as error_count_gauge,
-		sum(m.retry_count_gauge)::integer as retry_count_gauge,
-		sum(m.authentication_count_gauge)::integer as authentication_count_gauge,
-		sum(m.velocity_gauge)::numeric as velocity_gauge,
-		sum(m.cpu_load_gauge)::numeric as cpu_load_gauge,
-		sum(m.active_request_gauge)::integer as active_request_gauge,
-		sum(m.connection_count_gauge)::integer as connection_count_gauge,
-		sum(m.connection_pool_total_gauge)::integer as connection_pool_total_gauge,
-		sum(m.connection_pool_idle_gauge)::integer as connection_pool_idle_gauge,
-		sum(m.connection_pool_waiting_gauge)::integer as connection_pool_waiting_gauge,
-		sum(m.core_count_gauge)::integer as core_count_gauge,
-		avg(m.timer_gauge)::numeric as timer_gauge, -- needs to be raw
-		avg(m.duration_gauge)::numeric as duration_gauge,
-		avg(m.latency_gauge)::numeric as latency_gauge,
-		sum(m.duration_histogram_gauge[1])::integer as duration_histogram_gauge_1,
-		sum(m.duration_histogram_gauge[2])::integer as duration_histogram_gauge_2,
-		sum(m.duration_histogram_gauge[3])::integer as duration_histogram_gauge_3,
-		sum(m.duration_histogram_gauge[4])::integer as duration_histogram_gauge_4,
-		sum(m.duration_histogram_gauge[5])::integer as duration_histogram_gauge_5,
-		sum(m.duration_histogram_gauge[6])::integer as duration_histogram_gauge_6,
-		sum(m.duration_histogram_gauge[7])::integer as duration_histogram_gauge_7,
-		sum(m.latency_histogram_gauge[1])::integer as latency_histogram_gauge_1,
-		sum(m.latency_histogram_gauge[2])::integer as latency_histogram_gauge_2,
-		sum(m.latency_histogram_gauge[3])::integer as latency_histogram_gauge_3,
-		sum(m.latency_histogram_gauge[4])::integer as latency_histogram_gauge_4,
-		sum(m.latency_histogram_gauge[5])::integer as latency_histogram_gauge_5,
-		sum(m.latency_histogram_gauge[6])::integer as latency_histogram_gauge_6,
-		sum(m.latency_histogram_gauge[7])::integer as latency_histogram_gauge_7
-	from stsmonitor m
-	group by m.serviceid, m.serviceinstanceid, m.pid, m.ppid
-	having m.serviceinstanceid = _serviceinstanceid
-	order by m.serviceid, m.serviceinstanceid, m.pid, m.ppid;
-END
-$$;
-
-ALTER FUNCTION public.get_monitor_summary_by_serviceinstanceid(character varying)
+ALTER FUNCTION public.delete_stsentity_latest(character varying, character varying, character varying)
     OWNER TO postgres;
 
 
--- DROP FUNCTION purge_old_monitor_data(integer)
--- select * from purge_old_monitor_data(3) as rowsdel
-CREATE OR REPLACE FUNCTION public.purge_old_monitor_data(
-	_keep_age_seconds integer)
-	RETURNS INTEGER
-	LANGUAGE 'plpgsql'
-AS $$
-DECLARE
-  rows_deleted INTEGER;
-BEGIN
-	delete from stsmonitor m
-	where EXTRACT(EPOCH FROM (now() - m.validfrom)) > _keep_age_seconds;
-	GET DIAGNOSTICS rows_deleted = ROW_COUNT;
-  	RETURN rows_deleted;
-END
-$$;
-
-ALTER FUNCTION public.purge_old_monitor_data(integer)
-    OWNER TO postgres;