Merge commit '861c85ad10cc26db3e98dbd465ae3929dbdd21c6' into PGPROEE9_6_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/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

contrib/pgpro_scheduler/test/perl/runtest.pl

@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+use strict;
+no warnings;
+use Test::Harness;
+use DBI;
+use Getopt::Long;
+
+my $dbname;
+my $username;
+my $password;
+my $host;
+GetOptions ( "--host=s" => \$host,
+            "--dbname=s" => \$dbname,
+            "--username=s" => \$username,
+            "--password=s" => \$password);
+
+print "Prepare test enviroment\n";
+my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$password",
+    {PrintError => 0});
+if($dbh->err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+my $query = "DROP TABLE IF EXISTS test_results;";
+$dbh->do($query);
+if($dbh->err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+$query = "CREATE TABLE test_results( time_mark timestamp, commentary text );";
+$dbh->do($query);
+if($dbh->err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+$query = "DROP ROLE IF EXISTS tester;";
+$dbh->do($query);
+if($dbh->err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+$query = "CREATE ROLE tester;";
+$dbh->do($query);
+if($DBI::err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+$query = "GRANT INSERT ON test_results TO tester;";
+$dbh->do($query);
+if($dbh->err != 0){
+    print $DBI::errstr . "\n";
+    exit(-1);
+}
+
+$dbh->disconnect();
+
+print "Run tests\n";
+my @db_param = ["--host=$host", "--dbname=$dbname", "--username=$username", "--password=$password"];
+my %args = (
+    verbosity => 1,
+    test_args => @db_param
+);
+my $harness = TAP::Harness->new( \%args );
+my @tests = glob( 't/*.t' );
+$harness->runtests(@tests );
+
+
+
+
+
+

contrib/pgpro_scheduler/test/perl/t/activateJob.t

@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+use strict;
+no warnings;
+use Test::More;
+use DBI;
+use Getopt::Long;
+
+my $dbname;
+my $username;
+my $password;
+my $host;
+GetOptions ( "--host=s" => \$host,
+    "--dbname=s" => \$dbname,
+    "--username=s" => \$username,
+    "--password=s" => \$password);
+my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$password",
+    {PrintError => 0});
+ok($dbh->err == 0) or (print $DBI::errstr and BAIL_OUT);
+
+my $query = "DELETE FROM test_results;";
+$dbh->do($query);
+ok($dbh->err == 0) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+
+$query = "SELECT schedule.create_job(NULL, '');";
+my $sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err == 0) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+my $job_id = $sth->fetchrow_array() and $sth->finish();
+$sth->finish();
+
+$query = "SELECT schedule.deactivate_job(?)";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+$sth->finish();
+
+$query = "SELECT schedule.set_job_attributes(?, \'{ \"name\": \"Test\",
+    \"cron\": \"* * * * *\",
+    \"commands\": [\"INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJob'')\",
+                    \"INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJob'')\"],
+    \"run_as\": \"tester\",
+    \"use_same_transaction\": \"true\"
+    }\')";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+$sth->finish();
+
+$query = "SELECT schedule.activate_job(?)";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+$sth->finish();
+
+sleep 120;
+$query = "SELECT count(*) FROM test_results";
+$sth = $dbh->prepare($query);
+ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+
+my $result = $sth->fetchrow_array() and $sth->finish();
+ok ($result > 1) or print "Count == 0\n";
+
+$query = "SELECT schedule.deactivate_job(?)";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute()) or print $DBI::errstr ;
+$sth->finish();
+
+$query = "DELETE FROM test_results;";
+$dbh->do($query);
+ok($dbh->err == 0) or print $DBI::errstr;
+
+$query = "SELECT schedule.drop_job(?)";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute()) or print $DBI::errstr;
+$sth->finish();
+
+$dbh->disconnect();
+
+done_testing();

contrib/pgpro_scheduler/test/perl/t/createJobWithBadParam.t

@@ -0,0 +1,67 @@
+#!/usr/bin/perl
+use strict;
+no warnings;
+use Test::More;
+use DBI;
+use Getopt::Long;
+
+my $dbname;
+my $username;
+my $password;
+my $host;
+GetOptions ( "--host=s" => \$host,
+    "--dbname=s" => \$dbname,
+    "--username=s" => \$username,
+    "--password=s" => \$password);
+my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$password",
+    {PrintError => 0});
+ok($dbh->err == 0) or (print $DBI::errstr and BAIL_OUT);
+
+my $query = "DELETE FROM test_results;";
+$dbh->do($query);
+ok($dbh->err == 0) or print $DBI::errstr . "\n";
+
+$query = "SELECT schedule.create_job(\'abcdefghi\',
+            ARRAY[\'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\',
+                    \'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\']);";
+my $sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err != 0) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$query = "SELECT schedule.create_job(\'*bcdefgh*\',
+            ARRAY[\'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\',
+                    \'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\']);";
+$sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err != 0) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$query = "SELECT schedule.create_job(\'* * * # *\',
+            ARRAY[\'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\',
+                    \'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\']);";
+$sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err != 0) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$query = "SELECT schedule.create_job(\' \',
+            ARRAY[\'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\',
+                    \'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\']);";
+$sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err != 0) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$query = "SELECT schedule.create_job(\'\',
+            ARRAY[\'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\',
+                    \'INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJobWithCron'')\']);";
+$sth = $dbh->prepare($query);
+$sth->execute();
+ok($dbh->err != 0) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$dbh->disconnect();
+
+done_testing();
+