SW-41: sql between is inclusive, but we want exclusive edges

SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_functions_and_triggers.sql

@@ -297,7 +297,8 @@ BEGIN
     FOR intermediate_usage IN SELECT * FROM resource_allocation.resource_usage ru
     WHERE ru.resource_id = new_claim.resource_id
     AND ru.status_id = new_claim.status_id
-    AND ru.as_of_timestamp between new_claim.starttime and new_claim.endtime
+    AND ru.as_of_timestamp > new_claim.starttime
+    AND ru.as_of_timestamp < new_claim.endtime
     LOOP
         UPDATE resource_allocation.resource_usage ru SET usage = intermediate_usage.usage + new_claim.claim_size
         WHERE ru.id = intermediate_usage.id;
@@ -921,16 +922,6 @@ DECLARE
 BEGIN
     SELECT * from clock_timestamp() into proc_start;
 
---    IF TG_OP = 'INSERT' THEN
---        RAISE NOTICE 'before_claim_insertupdatedelete % %', TG_OP, NEW;
---    END IF;
---    IF TG_OP = 'UPDATE' THEN
---        RAISE NOTICE 'before_claim_insertupdatedelete % % %', TG_OP, OLD, NEW;
---    END IF;
---    IF TG_OP = 'DELETE' THEN
---        RAISE NOTICE 'before_claim_insertupdatedelete % %', TG_OP, OLD;
---    END IF;
-
     --order of following steps is important, do not reorder the steps
     IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE' THEN
         IF NEW.starttime >= NEW.endtime THEN