oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix multiple bugs related to Singleton workflows:

Browse source 
Can't use undef in a where clause.
    Have to use the same JSON encoding in all places.
Added tests for singleton workflow instances.
This commit is contained in:
Colin Kuskie 2008-09-12 22:59:43 +00:00
parent 993391a620
commit 5689c08bbc
3 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Workflow/Instance.pm
View file

@ -61,12 +61,17 @@ sub create {
my ($class, $session, $properties, $skipRealtime) = @_;
# do singleton check
my ($isSingleton) = $session->db->quickArray("select count(*) from Workflow where workflowId=? and
mode='singleton'",[$properties->{workflowId}]);
my $params = (exists $properties->{parameters})
? JSON->new->utf8->canonical->encode({parameters => $properties->{parameters}})
: undef;
my ($count) = $session->db->quickArray("select count(*) from WorkflowInstance where workflowId=? and parameters=?",[$properties->{workflowId},$params]);
my $placeHolders = [$properties->{workflowId}];
my ($isSingleton) = $session->db->quickArray("select count(*) from Workflow where workflowId=? and mode='singleton'",$placeHolders);
my $sql = "select count(*) from WorkflowInstance where workflowId=?";
if (exists $properties->{parameters}) {
push @{ $placeHolders }, JSON->new->utf8->pretty->encode({parameters => $properties->{parameters}});
$sql .= ' and parameters=?';
}
else {
$sql .= ' and parameters IS NULL';
}
my ($count) = $session->db->quickArray($sql,$placeHolders);
if ($isSingleton && $count) {
$session->log->info("An instance of singleton workflow $properties->{workflowId} already exists, not creating a new one");
return undef