zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-06 14:16:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated cron workflow and workflow execution select queries.

Browse Source 
- Exclude "is_archived" rows.
This commit is contained in:
Aleksandr Melnikov
2020-05-22 11:59:43 -07:00
parent d4fbd71d55
commit bc1236fef3
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cron_workflow.go
View File

@@ -572,6 +572,7 @@ func (c *Client) cronWorkflowSelectBuilderNamespaceName(namespace string, uid st
Where(sq.Eq{ Where(sq.Eq{
"cw.namespace": namespace, "cw.namespace": namespace,
"cw.name": uid, "cw.name": uid,
"cw.is_archived": false,
}) })
return sb return sb
@@ -585,6 +586,7 @@ func (c *Client) cronWorkflowSelectBuilderNoColumns(namespace string, workflowTe
Where(sq.Eq{ Where(sq.Eq{
"wt.namespace": namespace, "wt.namespace": namespace,
"wt.uid": workflowTemplateUid, "wt.uid": workflowTemplateUid,
"cw.is_archived": false,
}) })
return sb return sb
@@ -671,6 +673,7 @@ func (c *Client) SelectCronWorkflowWithWorkflowTemplateVersion(namespace, uid st
Where(sq.Eq{ Where(sq.Eq{
"wt.namespace": namespace, "wt.namespace": namespace,
"cw.name": uid, "cw.name": uid,
"cw.is_archived": false,
}). }).
ToSql() ToSql()

2
pkg/workflow_execution.go
View File

@@ -540,6 +540,7 @@ func (c *Client) GetWorkflowExecution(namespace, uid string) (workflow *Workflow
Where(sq.Eq{ Where(sq.Eq{
"wt.namespace": namespace, "wt.namespace": namespace,
"we.name": uid, "we.name": uid,
"we.is_archived": false,
}). }).
ToSql() ToSql()
if err != nil { if err != nil {
@@ -1446,6 +1447,7 @@ func (c *Client) getWorkflowExecutionAndTemplate(namespace string, uid string) (
Where(sq.Eq{ Where(sq.Eq{
"wt.namespace": namespace, "wt.namespace": namespace,
"we.name": uid, "we.name": uid,
"we.is_archived": false,
}). }).
ToSql() ToSql()
if err != nil { if err != nil {