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

cleaner sql handling

Browse Source
This commit is contained in:
Victor Vrantchan
2016-05-03 04:50:06 -04:00
parent d0dc23b2d8
commit 821f702f05
2 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
workflow/workflow.go
View File

@@ -2,6 +2,7 @@
package workflow
import (
"database/sql"
"errors"
"fmt"
"os"
@@ -19,10 +20,13 @@ 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);`
ON CONFLICT ON CONSTRAINT workflows_name_key DO NOTHING
RETURNING workflow_uuid;`
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)
ON CONFLICT ON CONSTRAINT workflow_profile_pkey DO NOTHING;`
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
@@ -58,23 +62,15 @@ type pgDatastore struct {
// CreateWorkflow creates a new workflow
func (db pgDatastore) CreateWorkflow(name string) (*Workflow, error) {
result, err := db.Exec(
createWorkflowStmt,
name,
)
if err != nil {
return nil, err
}
if res, _ := result.RowsAffected(); res == 0 {
workflow := &Workflow{Name: name}
err := db.QueryRow(createWorkflowStmt, name).Scan(&workflow.UUID)
if err == sql.ErrNoRows {
return nil, ErrNoRowsModified
}
var wf Workflow
err = db.Get(&wf, getWorkflowByNameStmt, name)
if err != nil {
return nil, err
}
return &wf, nil
return workflow, nil
}
// GetWorkflows returns all workflows in the database
@@ -106,8 +102,8 @@ func (db pgDatastore) AddProfile(wfUUID, pfUUID string) error {
if err != nil {
return err
}
if res, _ := result.RowsAffected(); res == 0 {
return ErrNoRowsModified
if _, err := result.RowsAffected(); err != nil {
return err
}
return nil
}
@@ -122,8 +118,8 @@ func (db pgDatastore) RemoveProfile(wfUUID, pfUUID string) error {
if err != nil {
return err
}
if res, _ := result.RowsAffected(); res == 0 {
return ErrNoRowsModified
if _, err := result.RowsAffected(); err != nil {
return err
}
return nil
}
@@ -199,12 +195,6 @@ func NewDB(driver, conn string, options ...func(*config) error) Datastore {
func migrate(db *sqlx.DB) {
schema := `
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
CREATE TABLE IF NOT EXISTS profiles (
profile_uuid uuid PRIMARY KEY
DEFAULT uuid_generate_v4(),
identifier text UNIQUE NOT NULL
);
CREATE TABLE IF NOT EXISTS workflows (
workflow_uuid uuid PRIMARY KEY
DEFAULT uuid_generate_v4(),

55
workflow/workflow_db_test.go
View File

@@ -22,13 +22,35 @@ func newDB(driver string) *sqlx.DB {
func TestMain(m *testing.M) {
db := newDB("postgres")
teardown(db)
setup(db)
retCode := m.Run()
// teardown(db)
teardown(db)
// call with result of m.Run()
os.Exit(retCode)
}
func setup(db *sqlx.DB) {
teardown(db)
schema := `
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
CREATE TABLE IF NOT EXISTS profiles (
profile_uuid uuid PRIMARY KEY
DEFAULT uuid_generate_v4(),
identifier text UNIQUE NOT NULL
);`
db.MustExec(schema)
}
func teardown(db *sqlx.DB) {
log.Println("workflow: dropping test tables")
drop := `
DROP TABLE IF EXISTS workflow_workflow;
DROP TABLE IF EXISTS workflow_profile;
DROP TABLE IF EXISTS workflows;
DROP TABLE IF EXISTS profiles;
`
db.MustExec(drop)
}
func TestNewDBConnection(t *testing.T) {
pg := newDB("postgres")
@@ -52,7 +74,17 @@ func TestCreateWorkflow(t *testing.T) {
t.Fatal(err)
}
wf, err := store.CreateWorkflow("test_workflow")
wf, err := store.CreateWorkflow("test_workflowX")
if err != nil {
t.Fatal(err)
}
wf, err = store.CreateWorkflow("test_workflowX")
if err == nil {
t.Fatalf("create workflow should fail on duplicate workflow, got no errors")
}
wf, err = store.CreateWorkflow("test_workflow")
if err != nil {
t.Fatal(err)
}
@@ -69,6 +101,10 @@ func TestCreateWorkflow(t *testing.T) {
if err != nil {
t.Fatal(err)
}
err = store.AddProfile(wf.UUID, pf.UUID)
if err != nil {
t.Fatal(err)
}
}
func TestGetWorkflows(t *testing.T) {
@@ -81,7 +117,7 @@ func TestGetWorkflows(t *testing.T) {
t.Fatal("should have at least one workflow")
}
if len(workflows[0].Profiles) == 0 {
if len(workflows[1].Profiles) == 0 {
t.Fatal("should have at least one profile")
}
}
@@ -110,14 +146,3 @@ func TestRemoveProfile(t *testing.T) {
t.Fatal(err)
}
}
func teardown(db *sqlx.DB) {
log.Println("workflow: dropping test tables")
drop := `
DROP TABLE IF EXISTS workflow_workflow;
DROP TABLE IF EXISTS workflow_profile;
DROP TABLE IF EXISTS workflows;
DROP TABLE IF EXISTS profiles;
`
db.MustExec(drop)
}