feat: include reference name in trigger

SimonRichardson · SimonRichardson · commit 3f8e4366e801 · 2025-01-06T09:01:44.000Z
If the reference name isn't included in the trigger, we can't have
multiple ones.
diff --git a/domain/schema/charm_schema_test.go b/domain/schema/charm_schema_test.go
@@ -4,6 +4,10 @@
 package schema
 
 import (
+	"context"
+	"database/sql"
+
+	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 )
 
@@ -19,16 +23,47 @@ func (s *charmSchemaSuite) TestCharmSequence(c *gc.C) {
 	// Insert the first sequence, then every other one is monotonically
 	// increasing.
 
-	s.assertExecSQL(c, "INSERT INTO sequence_charm_local (source_id, reference_name, sequence) VALUES ('1', 'foo', 1)")
-	s.assertExecSQL(c, "INSERT INTO charm (uuid, source_id, reference_name, revision) VALUES ('abc', '1', 'foo', 1)")
+	s.assertExecSQL(c, "INSERT INTO sequence_charm_local (reference_name, sequence) VALUES ('foo', 1)")
+	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=2 WHERE reference_name='foo'")
+	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=3 WHERE reference_name='foo'")
+
+	// Ensure we can't go backwards.
 
-	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=2 WHERE source_id='1' AND reference_name='foo'")
-	s.assertExecSQL(c, "INSERT INTO charm (uuid, source_id, reference_name, revision) VALUES ('def', '1', 'foo', 2)")
+	s.assertExecSQLError(c, "UPDATE sequence_charm_local SET sequence=2 AND reference_name='foo'", "sequence number must monotonically increase")
+}
 
-	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=3 WHERE source_id='1' AND reference_name='foo'")
-	s.assertExecSQL(c, "INSERT INTO charm (uuid, source_id, reference_name, revision) VALUES ('ghi', '1', 'foo', 3)")
+func (s *charmSchemaSuite) TestCharmSequenceWithMultipleReferenceNames(c *gc.C) {
+	s.applyDDL(c, ModelDDL())
 
-	// Ensure we can't go backwards.
+	s.assertExecSQL(c, "INSERT INTO sequence_charm_local (reference_name, sequence) VALUES ('foo', 1)")
+	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=2 WHERE reference_name='foo'")
+	s.assertExecSQL(c, "INSERT INTO sequence_charm_local (reference_name, sequence) VALUES ('bar', 1)")
+	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=3 WHERE reference_name='foo'")
+	s.assertExecSQL(c, "UPDATE sequence_charm_local SET sequence=2 WHERE reference_name='bar'")
+
+	s.assertSequence(c, "foo", 3)
+	s.assertSequence(c, "bar", 2)
+
+}
+
+func (s *charmSchemaSuite) assertSequence(c *gc.C, name string, expected int) {
+	var sequence int
+	err := s.TxnRunner().StdTxn(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+		row, err := tx.QueryContext(ctx, "SELECT sequence FROM sequence_charm_local WHERE reference_name=?", name)
+		if err != nil {
+			return err
+		}
+		defer row.Close()
+
+		if !row.Next() {
+			return sql.ErrNoRows
+		}
+		if err := row.Scan(&sequence); err != nil {
+			return err
+		}
 
-	s.assertExecSQLError(c, "UPDATE sequence_charm_local SET sequence=2 WHERE source_id='1' AND reference_name='foo'", "sequence number must monotonically increase")
+		return row.Err()
+	})
+	c.Assert(err, jc.ErrorIsNil)
+	c.Check(sequence, gc.Equals, expected)
 }
diff --git a/domain/schema/model.go b/domain/schema/model.go
@@ -126,7 +126,7 @@ func ModelDDL() *schema.Schema {
 		),
 
 		triggerGuardForTable("sequence_charm_local",
-			"NEW.sequence <= OLD.sequence",
+			"OLD.reference_name = NEW.reference_name AND NEW.sequence <= OLD.sequence",
 			"sequence number must monotonically increase",
 		),
 	)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func ModelDDL() *schema.Schema {`
`126`	`126`	`),`
`127`	`127`
`128`	`128`	`triggerGuardForTable("sequence_charm_local",`
`129`		`- "NEW.sequence <= OLD.sequence",`
	`129`	`+ "OLD.reference_name = NEW.reference_name AND NEW.sequence <= OLD.sequence",`
`130`	`130`	`"sequence number must monotonically increase",`
`131`	`131`	`),`
`132`	`132`	`)`