dtoro
64f7d54011
Problem: the hexagon's Phase 2 (plans/2026-08-15-hexagonal-architecture.md) must give the use-cases-to-be their contract surface: driven-port interfaces, test fakes, the secrets interface moved into core, and the postgres package inside the adapters tree — before the first vertical slice (Phase 3) can wire a composition root. Change: - internal/core/ports: full driven-port catalog per plan §3.3 — repositories as transaction-scoped aggregates whose inputs carry derived checks, audit, and events (§3.6), plus CommandExecutor, TargetResolver, Checker, Secrets, EventPublisher, Provisioner. Port-local payload types (Event, AuditEntry, CheckDef, KnowledgeEntry, ExecResult) keep signatures off infrastructure; TypeTree aliases internal/ontology (pure over domain) until checkdefaults is absorbed. ReadModels intentionally not declared yet — it materializes with the Phase 3 slice and grows as report handlers rewire. - secrets.Backend is now an alias of ports.Secrets; implementations (Infisical, SOPS, Manager) unchanged. mcp's local secretBackend subset is deleted; tool constructors take ports.Secrets. - internal/db → internal/adapters/postgres (mechanical import rewrite; package identifier stays db until the Phase 3 repository split). sqlc.yaml, Makefile, golangci exclusions, and docs follow the move; make generate-check verified. - internal/adapters/ssh: Executor implements ports.CommandExecutor over the actuator dial pool + RunStreaming (10-min default timeout carried over from the httpapi path). - internal/adapters/remote: Resolver implements ports.TargetResolver delegating to internal/remote (still pool-based; drops onto ports.EntityRepository when repositories land in Phase 3 — documented transitional import). - internal/core/ports/portstest: importable fakes — in-memory EntityRepo (with check-then-act SetState, side-effect recording), RecordingExecutor, FakeChecker, SpyPublisher; port-satisfaction guards; tests. Risk: ports are declared ahead of implementations — signatures firm up per phase as slices land (documented in the package doc); the remote→postgres transitional import is explicit and dissolves in Phase 3. Verification: go vet, make test (race, 19 packages), generate-check, golangci on core+adapters — 0 issues; full-repo baseline down 365→344.
108 lines
2.7 KiB
Go
108 lines
2.7 KiB
Go
package db
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func nonEmpty(stmts []string) []string {
|
|
var out []string
|
|
for _, s := range stmts {
|
|
if strings.TrimSpace(s) != "" {
|
|
out = append(out, s)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func TestSplitSQLBasic(t *testing.T) {
|
|
stmts := nonEmpty(splitSQL("CREATE TABLE a (id int); CREATE TABLE b (id int);"))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLDollarQuotedFunction(t *testing.T) {
|
|
sql := `CREATE FUNCTION f() RETURNS int AS $$
|
|
SELECT 1; SELECT 2;
|
|
$$ LANGUAGE sql;
|
|
CREATE TABLE t (id int);`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
if !strings.Contains(stmts[0], "SELECT 1; SELECT 2;") {
|
|
t.Errorf("dollar-quoted body was split: %q", stmts[0])
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLTaggedDollarQuote(t *testing.T) {
|
|
sql := `DO $body$ BEGIN PERFORM 1; END $body$;SELECT 1;`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLSemicolonInComment(t *testing.T) {
|
|
sql := "-- comment with ; semicolon\nCREATE TABLE t (id int); -- trailing; note\nSELECT 1;"
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLSemicolonInStringLiteral(t *testing.T) {
|
|
sql := `SELECT 'hello; world'; INSERT INTO t VALUES (1);`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLDollarSignInStringLiteral(t *testing.T) {
|
|
sql := `SELECT '$100'; SELECT 2;`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLBlockComment(t *testing.T) {
|
|
sql := `SELECT 1; /* block; with; semicolons */ SELECT 2;`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLBlockCommentWithDollarQuote(t *testing.T) {
|
|
sql := `/* $$ not a dollar quote */ SELECT 1;`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 1 {
|
|
t.Fatalf("got %d statements, want 1: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLDoubledQuoteInString(t *testing.T) {
|
|
sql := `SELECT 'O''Brien'; SELECT 2;`
|
|
stmts := nonEmpty(splitSQL(sql))
|
|
if len(stmts) != 2 {
|
|
t.Fatalf("got %d statements, want 2: %#v", len(stmts), stmts)
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLEmptyInput(t *testing.T) {
|
|
stmts := nonEmpty(splitSQL(""))
|
|
if len(stmts) != 0 {
|
|
t.Fatalf("got %d statements, want 0", len(stmts))
|
|
}
|
|
}
|
|
|
|
func TestSplitSQLNoSemicolon(t *testing.T) {
|
|
stmts := nonEmpty(splitSQL("SELECT 1"))
|
|
if len(stmts) != 1 {
|
|
t.Fatalf("got %d statements, want 1", len(stmts))
|
|
}
|
|
}
|