fix set_attr

Vladimir Ershov · Vladimir Ershov · commit f53981a82079 · 2017-03-07T16:19:51.000+03:00
diff --git a/pgpro_scheduler--2.0.sql b/pgpro_scheduler--2.0.sql
@@ -338,7 +338,7 @@ LANGUAGE plpgsql set search_path FROM CURRENT;
 CREATE FUNCTION _possible_args() RETURNS jsonb AS
 $BODY$
 BEGIN 
-   RETURN json_build_object(
+   RETURN jsonb_build_object(
       'node', 'node name (default: master)',
       'name', 'job name',
       'comments', 'some comments on job',
@@ -437,9 +437,9 @@ BEGIN
 	IF N > 0 THEN
 		EXECUTE 'SELECT array_agg(lll) FROM (SELECT distinct(date_trunc(''min'', unnest::timestamp with time zone)) as lll FROM unnest($1) ORDER BY date_trunc(''min'', unnest::timestamp with time zone)) as Z'
 			INTO dates USING dates;
-		cron := COALESCE(cron, '{}'::jsonb) || json_build_object('dates', array_to_json(dates))::jsonb;
+		cron := COALESCE(cron, '{}'::jsonb) || jsonb_build_object('dates', array_to_json(dates));
 	END IF;
-	
+
 	clean_cron := '{}'::jsonb;
 	FOR name IN SELECT * FROM unnest('{dates, crontab, onstart, days, hours, wdays, months, minutes}'::text[])
 	LOOP
@@ -635,7 +635,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(cron text, command text, node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('cron', cron, 'command', command, 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('cron', cron, 'command', command, 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -644,7 +644,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(dt timestamp with time zone, command text, node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('date', dt::text, 'command', command, 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('date', dt::text, 'command', command, 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -653,7 +653,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(dts timestamp with time zone[], command text, node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('dates', array_to_json(dts), 'command', command, 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('dates', array_to_json(dts), 'command', command, 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -662,7 +662,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(cron text, commands text[], node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('cron', cron, 'commands', array_to_json(commands), 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('cron', cron, 'commands', array_to_json(commands), 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -671,7 +671,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(dt timestamp with time zone, commands text[], node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('date', dt::text, 'commands', array_to_json(commands), 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('date', dt::text, 'commands', array_to_json(commands), 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -680,7 +680,7 @@ LANGUAGE plpgsql
 CREATE FUNCTION create_job(dts timestamp with time zone[], commands text[], node text DEFAULT NULL) RETURNS integer AS
 $BODY$
 BEGIN
-	RETURN create_job(json_build_object('dates', array_to_json(dts), 'commands', array_to_json(commands), 'node', node)::jsonb);
+	RETURN create_job(jsonb_build_object('dates', array_to_json(dts), 'commands', array_to_json(commands), 'node', node));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -796,14 +796,27 @@ $BODY$
 LANGUAGE plpgsql
    SECURITY DEFINER set search_path FROM CURRENT;
 
+CREATE FUNCTION set_job_attribute(jobId integer, name text, value jsonb) RETURNS boolean AS
+$BODY$
+BEGIN
+   IF name <> 'rule'  THEN
+      RAISE EXCEPTION 'key % cannot have a jsonb value. Only "rule" allowed', name;
+   END IF;
+
+   RETURN set_job_attributes(jobId, jsonb_build_object(name, value));
+END
+$BODY$
+LANGUAGE plpgsql
+   SECURITY DEFINER set search_path FROM CURRENT;
+
 CREATE FUNCTION set_job_attribute(jobId integer, name text, value anyarray) RETURNS boolean AS
 $BODY$
 BEGIN
    IF name <> 'dates' AND name <> 'commands' THEN
       RAISE EXCEPTION 'key % cannot have an array value. Only dates, commands allowed', name;
    END IF;
 
-   RETURN set_job_attributes(jobId, json_build_object(name, array_to_json(value))::jsonb);
+   RETURN set_job_attributes(jobId, jsonb_build_object(name, array_to_json(value)));
 END
 $BODY$
 LANGUAGE plpgsql
@@ -815,9 +828,11 @@ DECLARE
    attrs jsonb;
 BEGIN
    IF name = 'dates' OR name = 'commands' THEN
-      attrs := json_build_object(name, array_to_json(value::text[]));
+      attrs := jsonb_build_object(name, array_to_json(value::text[]));
+   ELSIF name = 'rule' THEN
+      attrs := jsonb_build_object('rule', value::jsonb);
    ELSE
-      attrs := json_build_object(name, value);
+      attrs := jsonb_build_object(name, value);
    END IF;
    RETURN set_job_attributes(jobId, attrs);
 END
