From 7361fd4600beb8874d330209faf4fa57ffecc15d Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 12 Feb 2025 09:49:27 -0800
Subject: [PATCH] Combine action add/edit with on conflict replace

---
 cmd/actionAdd.go                 |  4 +++-
 cmd/actionEdit.go                |  2 +-
 core/action.go                   | 11 +----------
 core/action_test.go              |  8 ++++----
 core/source_test.go              |  4 ++--
 core/sql/0001_initial_schema.sql |  2 +-
 6 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/cmd/actionAdd.go b/cmd/actionAdd.go
index a39d25c..6e43224 100644
--- a/cmd/actionAdd.go
+++ b/cmd/actionAdd.go
@@ -27,6 +27,8 @@ func init() {
 	actionAddCmd.MarkFlagRequired("action")
 }
 
+// TODO: This is a duplicate of `action edit`, the action CLI should be simplified
+
 func actionAdd(source string, action string, argv []string) {
 	if source == "" {
 		log.Fatal("error: --source is empty")
@@ -40,7 +42,7 @@ func actionAdd(source string, action string, argv []string) {
 
 	db := openAndMigrateDb()
 
-	err := core.AddAction(db, source, action, argv)
+	err := core.SetAction(db, source, action, argv)
 	if err != nil {
 		log.Fatalf("error: failed to add action: %v", err)
 	}
diff --git a/cmd/actionEdit.go b/cmd/actionEdit.go
index 32d1fbf..df91d74 100644
--- a/cmd/actionEdit.go
+++ b/cmd/actionEdit.go
@@ -40,7 +40,7 @@ func actionEdit(source string, action string, argv []string) {
 
 	db := openAndMigrateDb()
 
-	err := core.UpdateAction(db, source, action, argv)
+	err := core.SetAction(db, source, action, argv)
 	if err != nil {
 		log.Fatalf("error: failed to update action: %v", err)
 	}
diff --git a/core/action.go b/core/action.go
index 5a5775e..09695aa 100644
--- a/core/action.go
+++ b/core/action.go
@@ -16,7 +16,7 @@ func (a *argList) Scan(value interface{}) error {
 	return json.Unmarshal([]byte(value.(string)), a)
 }
 
-func AddAction(db DB, source string, name string, argv []string) error {
+func SetAction(db DB, source string, name string, argv []string) error {
 	_, err := db.Exec(`
 		insert into actions (source, name, argv)
 		values (?, ?, jsonb(?))
@@ -24,15 +24,6 @@ func AddAction(db DB, source string, name string, argv []string) error {
 	return err
 }
 
-func UpdateAction(db DB, source string, name string, argv []string) error {
-	_, err := db.Exec(`
-		update actions
-		set argv = jsonb(?)
-		where source = ? and name = ?
-	`, argList(argv), source, name)
-	return err
-}
-
 func GetActionsForSource(db DB, source string) ([]string, error) {
 	rows, err := db.Query(`
 		select name
diff --git a/core/action_test.go b/core/action_test.go
index 7941215..43bb77e 100644
--- a/core/action_test.go
+++ b/core/action_test.go
@@ -7,7 +7,7 @@ import (
 func TestActionCreate(t *testing.T) {
 	db := EphemeralDb(t)
 
-	if err := AddAction(db, "test", "hello", []string{"echo", "hello"}); err == nil {
+	if err := SetAction(db, "test", "hello", []string{"echo", "hello"}); err == nil {
 		t.Fatal("Action created for nonexistent source")
 	}
 
@@ -15,13 +15,13 @@ func TestActionCreate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if err := AddAction(db, "test", "hello", []string{"echo", "hello"}); err != nil {
+	if err := SetAction(db, "test", "hello", []string{"echo", "hello"}); err != nil {
 		t.Fatal(err)
 	}
-	if err := AddAction(db, "test", "goodbye", []string{"exit", "1"}); err != nil {
+	if err := SetAction(db, "test", "goodbye", []string{"exit", "1"}); err != nil {
 		t.Fatal(err)
 	}
-	if err := UpdateAction(db, "test", "goodbye", []string{"echo", "goodbye"}); err != nil {
+	if err := SetAction(db, "test", "goodbye", []string{"echo", "goodbye"}); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/core/source_test.go b/core/source_test.go
index b2a6588..5e0a88c 100644
--- a/core/source_test.go
+++ b/core/source_test.go
@@ -141,7 +141,7 @@ func TestOnCreateAction(t *testing.T) {
 	if err := AddSource(db, "test"); err != nil {
 		t.Fatal(err)
 	}
-	if err := AddAction(db, "test", "on_create", []string{"true"}); err != nil {
+	if err := SetAction(db, "test", "on_create", []string{"true"}); err != nil {
 		t.Fatal(err)
 	}
 
@@ -164,7 +164,7 @@ func TestOnCreateAction(t *testing.T) {
 
 	onCreate := func(argv []string) {
 		t.Helper()
-		if err := UpdateAction(db, "test", "on_create", argv); err != nil {
+		if err := SetAction(db, "test", "on_create", argv); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/core/sql/0001_initial_schema.sql b/core/sql/0001_initial_schema.sql
index f604253..c0089e3 100644
--- a/core/sql/0001_initial_schema.sql
+++ b/core/sql/0001_initial_schema.sql
@@ -7,7 +7,7 @@ create table actions(
     source text not null,
     name text not null,
     argv blob not null,
-    primary key (source, name),
+    unique (source, name) on conflict replace,
     foreign key (source) references sources (name) on delete cascade
 ) strict;
 create table envs(