ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-12 13:17:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

move sql statements to top level vars

Browse Source
This commit is contained in:
Victor Vrantchan
2016-05-03 03:43:39 -04:00
parent 8c61bfbca0
commit f22a408032
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
workflow/workflow.go
View File

@@ -15,7 +15,20 @@ import (
)
// ErrNoRowsModified is returned if insert didn't produce results
var ErrNoRowsModified = errors.New("DB: No rows affected")
var ErrNoRowsModified = errors.New("db: no rows affected")
var (
createWorkflowStmt = `INSERT INTO workflows (name) VALUES ($1)
ON CONFLICT ON CONSTRAINT workflows_name_key DO NOTHING;`
getWorkflowByNameStmt = `SELECT workflow_uuid, name FROM workflows WHERE name=$1`
selectWorkflowsStmt = `SELECT workflow_uuid, name FROM workflows`
addProfileStmt = `INSERT INTO workflow_profile (workflow_uuid, profile_uuid) VALUES ($1, $2);`
removeProfileStmt = `DELETE FROM workflow_profile WHERE workflow_uuid=$1 AND profile_uuid=$2;`
getProfilesForWorkflowStmt = `SELECT profiles.profile_uuid,identifier FROM profiles
LEFT JOIN workflow_profile
ON workflow_profile.profile_uuid = profiles.profile_uuid
WHERE workflow_profile.workflow_uuid=$1`
)
type application struct {
ManagementFlags int
@@ -45,14 +58,9 @@ type pgDatastore struct {
// CreateWorkflow creates a new workflow
func (db pgDatastore) CreateWorkflow(name string) (*Workflow, error) {
upsert := `INSERT INTO workflows
(name)
VALUES ($1)
ON CONFLICT ON CONSTRAINT workflows_name_key
DO NOTHING;`
result, err := db.Exec(
upsert,
createWorkflowStmt,
name,
)
if err != nil {
@@ -62,7 +70,7 @@ func (db pgDatastore) CreateWorkflow(name string) (*Workflow, error) {
return nil, ErrNoRowsModified
}
var wf Workflow
err = db.Get(&wf, "SELECT * FROM workflows WHERE name=$1", name)
err = db.Get(&wf, getWorkflowByNameStmt, name)
if err != nil {
return nil, err
}
@@ -72,7 +80,7 @@ func (db pgDatastore) CreateWorkflow(name string) (*Workflow, error) {
// GetWorkflows returns all workflows in the database
func (db pgDatastore) GetWorkflows() ([]Workflow, error) {
var workflows []Workflow
err := db.Select(&workflows, "SELECT * FROM workflows")
err := db.Select(&workflows, selectWorkflowsStmt)
if err != nil {
return nil, err
}
@@ -90,12 +98,8 @@ func (db pgDatastore) GetWorkflows() ([]Workflow, error) {
// AddProfile adds a profile to a workflow
func (db pgDatastore) AddProfile(wfUUID, pfUUID string) error {
update := `INSERT INTO workflow_profile
(workflow_uuid, profile_uuid)
VALUES ($1, $2);`
result, err := db.Exec(
update,
addProfileStmt,
wfUUID,
pfUUID,
)
@@ -110,10 +114,8 @@ func (db pgDatastore) AddProfile(wfUUID, pfUUID string) error {
// RemoveProfile removes a profile wrom a workflow
func (db pgDatastore) RemoveProfile(wfUUID, pfUUID string) error {
remove := `DELETE FROM workflow_profile
WHERE workflow_uuid=$1 AND profile_uuid=$2;`
result, err := db.Exec(
remove,
removeProfileStmt,
wfUUID,
pfUUID,
)
@@ -126,22 +128,12 @@ func (db pgDatastore) RemoveProfile(wfUUID, pfUUID string) error {
return nil
}
func (db pgDatastore) getProfilesForWorkflow(uuid string) ([]profile.Profile, error) {
var profileUUIDs []string
err := db.Select(&profileUUIDs, "SELECT profile_uuid FROM workflow_profile WHERE workflow_uuid=$1", uuid)
func (db pgDatastore) getProfilesForWorkflow(workflowUUID string) ([]profile.Profile, error) {
var profiles []profile.Profile
err := db.Select(&profiles, getProfilesForWorkflowStmt, workflowUUID)
if err != nil {
return nil, err
}
var profiles []profile.Profile
for _, id := range profileUUIDs {
var pf profile.Profile
err := db.Get(&pf, "SELECT * FROM profiles WHERE profile_uuid=$1", id)
if err != nil {
return nil, err
}
profiles = append(profiles, pf)
}
return profiles, nil
}

4
workflow/workflow_db_test.go
View File

@@ -1,7 +1,6 @@
package workflow
import (
"fmt"
"log"
"os"
"testing"
@@ -25,7 +24,7 @@ func TestMain(m *testing.M) {
db := newDB("postgres")
teardown(db)
retCode := m.Run()
teardown(db)
// teardown(db)
// call with result of m.Run()
os.Exit(retCode)
@@ -85,7 +84,6 @@ func TestGetWorkflows(t *testing.T) {
if len(workflows[0].Profiles) == 0 {
t.Fatal("should have at least one profile")
}
fmt.Printf("%+v", workflows[0])
}
func TestRemoveProfile(t *testing.T) {