refactor: replace factory/memory imports with direct dolt calls (Phase 7 cleanup)
Phase 7 (a5da57e3) deleted internal/storage/factory/ and internal/storage/memory/
but left 30+ files still importing them. This commit fixes all broken references:
- Created internal/storage/dolt/open.go with NewFromConfig/NewFromConfigWithOptions
- Replaced all factory.New/NewFromConfig/NewWithOptions with dolt equivalents
- Broke import cycles in dolt/bootstrap.go (routing/utils/audit → local types)
- Removed dead storage.Config struct
- Converted all test files from memory.New() to dolt.New() test stores
- Removed tests that depended on deleted detectPrefix/LoadFromIssues/mockRemoteStore
46 files changed, 249 insertions(+), 851 deletions(-)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Executed-By: beads/crew/emma
Rig: beads
Role: crew
This commit is contained in:
parent
d6e0a8576e
commit
12f9037d87
47 changed files with 320 additions and 851 deletions
5
beads.go
5
beads.go
|
|
@ -11,8 +11,7 @@ import (
|
|||
"context"
|
||||
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -31,7 +30,7 @@ func NewSQLiteStorage(ctx context.Context, dbPath string) (Storage, error) {
|
|||
|
||||
// NewStorage creates a new storage instance at the given path using the Dolt backend.
|
||||
func NewStorage(ctx context.Context, dbPath string) (Storage, error) {
|
||||
return factory.New(ctx, configfile.BackendDolt, dbPath)
|
||||
return dolt.New(ctx, &dolt.Config{Path: dbPath})
|
||||
}
|
||||
|
||||
// GetConfiguredBackend returns the backend type from the beads directory config.
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import (
|
|||
"path/filepath"
|
||||
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
|
|
@ -28,11 +29,24 @@ func bootstrapEmbeddedDolt(ctx context.Context, path string, cfg *dolt.Config) e
|
|||
return nil // Dolt exists, no bootstrap needed
|
||||
}
|
||||
|
||||
// Load routes from routes.jsonl for bootstrap import.
|
||||
// Routes are passed to Bootstrap to avoid import cycles (routing → dolt → routing).
|
||||
var bootstrapRoutes []dolt.BootstrapRoute
|
||||
if routes, err := routing.LoadRoutes(beadsDir); err == nil {
|
||||
for _, r := range routes {
|
||||
bootstrapRoutes = append(bootstrapRoutes, dolt.BootstrapRoute{
|
||||
Prefix: r.Prefix,
|
||||
Path: r.Path,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
bootstrapped, result, err := dolt.Bootstrap(ctx, dolt.BootstrapConfig{
|
||||
BeadsDir: beadsDir,
|
||||
DoltPath: path,
|
||||
LockTimeout: cfg.OpenTimeout,
|
||||
Database: cfg.Database,
|
||||
Routes: bootstrapRoutes,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("bootstrap failed: %w", err)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ func issueIDCompletion(cmd *cobra.Command, args []string, toComplete string) ([]
|
|||
if lockTimeout > 0 {
|
||||
timeout = lockTimeout
|
||||
}
|
||||
currentStore, err = factory.NewWithOptions(ctx, configfile.BackendDolt, currentDBPath, factory.Options{ReadOnly: true, LockTimeout: timeout})
|
||||
currentStore, err = dolt.New(ctx, &dolt.Config{Path: currentDBPath, ReadOnly: true, OpenTimeout: timeout})
|
||||
if err != nil {
|
||||
// If we can't open database, return empty completion
|
||||
return nil, cobra.ShellCompDirectiveNoFileComp
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
//go:build cgo
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -24,11 +26,14 @@ func TestIssueIDCompletion(t *testing.T) {
|
|||
ctx := context.Background()
|
||||
rootCtx = ctx
|
||||
|
||||
// Create in-memory store for testing
|
||||
memStore := memory.New("")
|
||||
store = memStore
|
||||
// Create dolt store for testing
|
||||
tmpDir := t.TempDir()
|
||||
testDB := filepath.Join(tmpDir, "test.db")
|
||||
testStore := newTestStoreWithPrefix(t, testDB, "bd")
|
||||
store = testStore
|
||||
|
||||
// Create test issues
|
||||
now := time.Now()
|
||||
testIssues := []*types.Issue{
|
||||
{
|
||||
ID: "bd-abc1",
|
||||
|
|
@ -57,12 +62,12 @@ func TestIssueIDCompletion(t *testing.T) {
|
|||
Status: types.StatusClosed,
|
||||
Priority: 3,
|
||||
IssueType: types.TypeTask,
|
||||
ClosedAt: &[]time.Time{time.Now()}[0],
|
||||
ClosedAt: &now,
|
||||
},
|
||||
}
|
||||
|
||||
for _, issue := range testIssues {
|
||||
if err := memStore.CreateIssue(ctx, issue, "test"); err != nil {
|
||||
if err := testStore.CreateIssue(ctx, issue, "test"); err != nil {
|
||||
t.Fatalf("Failed to create test issue: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -342,9 +347,11 @@ func TestIssueIDCompletion_EmptyDatabase(t *testing.T) {
|
|||
ctx := context.Background()
|
||||
rootCtx = ctx
|
||||
|
||||
// Create empty in-memory store
|
||||
memStore := memory.New("")
|
||||
store = memStore
|
||||
// Create empty dolt store
|
||||
tmpDir := t.TempDir()
|
||||
testDB := filepath.Join(tmpDir, "test.db")
|
||||
testStore := newTestStoreWithPrefix(t, testDB, "bd")
|
||||
store = testStore
|
||||
|
||||
cmd := &cobra.Command{}
|
||||
args := []string{}
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ var createCmd = &cobra.Command{
|
|||
// Open new store for target repo using factory to respect backend config
|
||||
targetBeadsDirPath := filepath.Join(targetBeadsDir, ".beads")
|
||||
var err error
|
||||
targetStore, err = factory.NewFromConfig(rootCtx, targetBeadsDirPath)
|
||||
targetStore, err = dolt.NewFromConfig(rootCtx, targetBeadsDirPath)
|
||||
if err != nil {
|
||||
FatalError("failed to open target store: %v", err)
|
||||
}
|
||||
|
|
@ -846,7 +846,7 @@ func createInRig(cmd *cobra.Command, rigName, explicitID, title, description, is
|
|||
}
|
||||
|
||||
// Open storage for the target rig using factory to respect backend config
|
||||
targetStore, err := factory.NewFromConfig(ctx, targetBeadsDir)
|
||||
targetStore, err := dolt.NewFromConfig(ctx, targetBeadsDir)
|
||||
if err != nil {
|
||||
FatalError("failed to open rig %q database: %v", rigName, err)
|
||||
}
|
||||
|
|
@ -1038,13 +1038,13 @@ func ensureBeadsDirForPath(ctx context.Context, targetPath string, sourceStore *
|
|||
}
|
||||
}
|
||||
|
||||
// Initialize database - it will be created when factory.New is called
|
||||
// Initialize database - it will be created when dolt.New is called
|
||||
// But we need to set the prefix if source store has one (T012: prefix inheritance)
|
||||
if sourceStore != nil {
|
||||
sourcePrefix, err := sourceStore.GetConfig(ctx, "issue_prefix")
|
||||
if err == nil && sourcePrefix != "" {
|
||||
// Open target store temporarily to set prefix
|
||||
tempStore, err := factory.New(ctx, configfile.BackendDolt, dbPath)
|
||||
tempStore, err := dolt.New(ctx, &dolt.Config{Path: dbPath})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to initialize target database: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1047,7 +1047,7 @@ func resolveExternalDependencies(ctx context.Context, depStore *dolt.DoltStore,
|
|||
}
|
||||
|
||||
// Open storage for the target rig (auto-detect backend from metadata.json)
|
||||
targetStore, err := factory.NewFromConfig(ctx, targetBeadsDir)
|
||||
targetStore, err := dolt.NewFromConfig(ctx, targetBeadsDir)
|
||||
if err != nil {
|
||||
if isVerbose() {
|
||||
fmt.Fprintf(os.Stderr, "[external-deps] failed to open target db %s: %v\n", targetBeadsDir, err)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/debug"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/syncbranch"
|
||||
)
|
||||
|
||||
|
|
@ -54,9 +54,9 @@ func ensureStoreActive() error {
|
|||
}
|
||||
}
|
||||
|
||||
// Use factory to create the appropriate backend (SQLite, Dolt embedded, or Dolt server)
|
||||
// Use dolt.NewFromConfig to create the appropriate backend
|
||||
// based on metadata.json configuration
|
||||
store, err := factory.NewFromConfig(getRootContext(), beadsDir)
|
||||
store, err := dolt.NewFromConfig(getRootContext(), beadsDir)
|
||||
if err != nil {
|
||||
// Check for fresh clone scenario (JSONL exists but no database)
|
||||
if _, statErr := os.Stat(jsonlPath); statErr == nil {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/steveyegge/beads/cmd/bd/doctor/fix"
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
storagefactory "github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ func CheckDatabaseVersion(path string, cliVersion string) DoctorCheck {
|
|||
}
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Database",
|
||||
|
|
@ -230,7 +230,7 @@ func CheckSchemaCompatibility(path string) DoctorCheck {
|
|||
}
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Schema Compatibility",
|
||||
|
|
@ -361,7 +361,7 @@ func CheckDatabaseIntegrity(path string) DoctorCheck {
|
|||
}
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Database Integrity",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import (
|
|||
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/doltutil"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// closeDoltDBWithTimeout closes a sql.DB with a timeout to prevent indefinite hangs.
|
||||
|
|
@ -117,9 +117,9 @@ func closeDoltDB(db *sql.DB, serverMode bool) {
|
|||
// GetBackend returns the configured backend type from configuration.
|
||||
// It checks config.yaml first (storage-backend key), then falls back to metadata.json.
|
||||
// Returns "dolt" (default) or "sqlite" (legacy).
|
||||
// hq-3446fc.17: Use factory.GetBackendFromConfig for consistent backend detection.
|
||||
// hq-3446fc.17: Use dolt.GetBackendFromConfig for consistent backend detection.
|
||||
func GetBackend(beadsDir string) string {
|
||||
return factory.GetBackendFromConfig(beadsDir)
|
||||
return dolt.GetBackendFromConfig(beadsDir)
|
||||
}
|
||||
|
||||
// IsDoltBackend returns true if the configured backend is Dolt.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ func StaleClosedIssues(path string) error {
|
|||
|
||||
// Open database using factory to respect backend configuration (bd-m2jr: SQLite fallback fix)
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open database: %w", err)
|
||||
}
|
||||
|
|
@ -127,7 +127,7 @@ func PatrolPollution(path string) error {
|
|||
|
||||
// Open database using factory to respect backend configuration (bd-m2jr: SQLite fallback fix)
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open database: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// FixMissingMetadata checks and repairs missing metadata fields in a Dolt database.
|
||||
|
|
@ -36,7 +36,7 @@ func FixMissingMetadata(path string, bdVersion string) error {
|
|||
|
||||
ctx := context.Background()
|
||||
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open store: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// setupDoltWorkspace creates a temp beads workspace with a Dolt database.
|
||||
|
|
@ -49,7 +49,8 @@ func setupDoltWorkspace(t *testing.T) string {
|
|||
// Create the Dolt store via factory (which bootstraps the database)
|
||||
ctx := context.Background()
|
||||
doltPath := filepath.Join(beadsDir, "dolt")
|
||||
store, err := factory.NewWithOptions(ctx, configfile.BackendDolt, doltPath, factory.Options{
|
||||
store, err := dolt.New(ctx, &dolt.Config{
|
||||
Path: doltPath,
|
||||
Database: "beads",
|
||||
})
|
||||
if err != nil {
|
||||
|
|
@ -77,7 +78,7 @@ func TestFixMissingMetadata_DoltRepair(t *testing.T) {
|
|||
// Verify metadata was written by opening the store
|
||||
ctx := context.Background()
|
||||
beadsDir := filepath.Join(dir, ".beads")
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store for verification: %v", err)
|
||||
}
|
||||
|
|
@ -125,7 +126,7 @@ func TestFixMissingMetadata_DoltIdempotent(t *testing.T) {
|
|||
// Read the values that were set
|
||||
ctx := context.Background()
|
||||
beadsDir := filepath.Join(dir, ".beads")
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to open store: %v", err)
|
||||
}
|
||||
|
|
@ -140,7 +141,7 @@ func TestFixMissingMetadata_DoltIdempotent(t *testing.T) {
|
|||
}
|
||||
|
||||
// Verify values did not change (version should remain 0.49.6, not 0.50.0)
|
||||
store2, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store2, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store: %v", err)
|
||||
}
|
||||
|
|
@ -170,7 +171,7 @@ func TestFixMissingMetadata_DoltPartialRepair(t *testing.T) {
|
|||
// Pre-set only bd_version
|
||||
ctx := context.Background()
|
||||
beadsDir := filepath.Join(dir, ".beads")
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to open store: %v", err)
|
||||
}
|
||||
|
|
@ -185,7 +186,7 @@ func TestFixMissingMetadata_DoltPartialRepair(t *testing.T) {
|
|||
}
|
||||
|
||||
// Verify: bd_version should remain 0.48.0 (not overwritten)
|
||||
store2, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store2, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// DBJSONLSync fixes database-JSONL sync issues by running the appropriate sync command.
|
||||
|
|
@ -159,7 +159,7 @@ func DBJSONLSync(path string) error {
|
|||
// storage factory for backend-agnostic access (bd-lftxx).
|
||||
func countDatabaseIssues(beadsDir string) (int, error) {
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfigWithOptions(ctx, beadsDir, factory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("failed to open database: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/git"
|
||||
storagefactory "github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// CheckIDFormat checks whether issues use hash-based or sequential IDs
|
||||
|
|
@ -50,7 +50,7 @@ func CheckIDFormat(path string) DoctorCheck {
|
|||
// Open the configured backend in read-only mode.
|
||||
// This must work for both SQLite and Dolt.
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Issue IDs",
|
||||
|
|
@ -136,7 +136,7 @@ func CheckDependencyCycles(path string) DoctorCheck {
|
|||
|
||||
// Open the configured backend in read-only mode (works for both SQLite and Dolt)
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Dependency Cycles",
|
||||
|
|
@ -349,7 +349,7 @@ func CheckRepoFingerprint(path string) DoctorCheck {
|
|||
// For Dolt, read fingerprint from storage metadata (no sqlite assumptions).
|
||||
if backend == configfile.BackendDolt {
|
||||
ctx := context.Background()
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "Repo Fingerprint",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
"strings"
|
||||
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// kvPrefix matches the prefix used in cmd/bd/kv.go
|
||||
|
|
@ -18,7 +18,7 @@ func CheckKVSyncStatus(path string) DoctorCheck {
|
|||
_, beadsDir := getBackendAndBeadsDir(path)
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
return DoctorCheck{
|
||||
Name: "KV Store Sync",
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
//go:build cgo
|
||||
|
||||
package doctor
|
||||
|
||||
import (
|
||||
|
|
@ -6,10 +8,26 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
// newTestDoltStore creates a DoltStore in a temp directory with the given issue prefix.
|
||||
func newTestDoltStore(t *testing.T, prefix string) *dolt.DoltStore {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
store, err := dolt.New(ctx, &dolt.Config{Path: filepath.Join(t.TempDir(), "test.db")})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create dolt store: %v", err)
|
||||
}
|
||||
if err := store.SetConfig(ctx, "issue_prefix", prefix); err != nil {
|
||||
store.Close()
|
||||
t.Fatalf("Failed to set issue_prefix: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { store.Close() })
|
||||
return store
|
||||
}
|
||||
|
||||
func newTestIssue(id string) *types.Issue {
|
||||
return &types.Issue{
|
||||
ID: id,
|
||||
|
|
@ -20,9 +38,9 @@ func newTestIssue(id string) *types.Issue {
|
|||
}
|
||||
}
|
||||
|
||||
// insertIssueDirectly inserts an issue with a pre-set ID into the memory store.
|
||||
// insertIssueDirectly inserts an issue with a pre-set ID into the dolt store.
|
||||
// This simulates cross-rig contamination where foreign-prefix issues end up in the store.
|
||||
func insertIssueDirectly(t *testing.T, store *memory.MemoryStorage, id string) {
|
||||
func insertIssueDirectly(t *testing.T, store *dolt.DoltStore, id string) {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
issue := newTestIssue(id)
|
||||
|
|
@ -335,20 +353,7 @@ func TestMigrationValidationResult_JSONSerialization(t *testing.T) {
|
|||
|
||||
func TestCategorizeDoltExtras_AllForeign(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir, err := os.MkdirTemp("", "bd-categorize-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
jsonlPath := filepath.Join(tmpDir, "issues.jsonl")
|
||||
store := memory.New(jsonlPath)
|
||||
defer store.Close()
|
||||
|
||||
// Set local prefix to "bd"
|
||||
if err := store.SetConfig(ctx, "issue_prefix", "bd"); err != nil {
|
||||
t.Fatalf("failed to set prefix: %v", err)
|
||||
}
|
||||
store := newTestDoltStore(t, "bd")
|
||||
|
||||
// Create local issues via store
|
||||
for _, id := range []string{"bd-001", "bd-002"} {
|
||||
|
|
@ -382,19 +387,7 @@ func TestCategorizeDoltExtras_AllForeign(t *testing.T) {
|
|||
|
||||
func TestCategorizeDoltExtras_MixedEphemeralAndForeign(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir, err := os.MkdirTemp("", "bd-categorize-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
jsonlPath := filepath.Join(tmpDir, "issues.jsonl")
|
||||
store := memory.New(jsonlPath)
|
||||
defer store.Close()
|
||||
|
||||
if err := store.SetConfig(ctx, "issue_prefix", "bd"); err != nil {
|
||||
t.Fatalf("failed to set prefix: %v", err)
|
||||
}
|
||||
store := newTestDoltStore(t, "bd")
|
||||
|
||||
// Create local issues via store
|
||||
for _, id := range []string{"bd-001", "bd-003"} {
|
||||
|
|
@ -422,19 +415,7 @@ func TestCategorizeDoltExtras_MixedEphemeralAndForeign(t *testing.T) {
|
|||
|
||||
func TestCategorizeDoltExtras_AllEphemeral(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir, err := os.MkdirTemp("", "bd-categorize-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
jsonlPath := filepath.Join(tmpDir, "issues.jsonl")
|
||||
store := memory.New(jsonlPath)
|
||||
defer store.Close()
|
||||
|
||||
if err := store.SetConfig(ctx, "issue_prefix", "bd"); err != nil {
|
||||
t.Fatalf("failed to set prefix: %v", err)
|
||||
}
|
||||
store := newTestDoltStore(t, "bd")
|
||||
|
||||
// All extras are same-prefix (ephemeral)
|
||||
for _, id := range []string{"bd-001", "bd-002", "bd-003"} {
|
||||
|
|
@ -457,19 +438,7 @@ func TestCategorizeDoltExtras_AllEphemeral(t *testing.T) {
|
|||
|
||||
func TestCategorizeDoltExtras_NoExtras(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir, err := os.MkdirTemp("", "bd-categorize-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
jsonlPath := filepath.Join(tmpDir, "issues.jsonl")
|
||||
store := memory.New(jsonlPath)
|
||||
defer store.Close()
|
||||
|
||||
if err := store.SetConfig(ctx, "issue_prefix", "bd"); err != nil {
|
||||
t.Fatalf("failed to set prefix: %v", err)
|
||||
}
|
||||
store := newTestDoltStore(t, "bd")
|
||||
|
||||
for _, id := range []string{"bd-001", "bd-002"} {
|
||||
if err := store.CreateIssue(ctx, newTestIssue(id), "test"); err != nil {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// CheckBeadsRole verifies that beads.role is configured.
|
||||
|
|
@ -75,7 +75,7 @@ func getRoleFromDatabase(path string) string {
|
|||
}
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfigWithOptions(ctx, beadsDir, factory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/debug"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/utils"
|
||||
"github.com/steveyegge/beads/internal/validation"
|
||||
|
|
@ -180,8 +180,8 @@ Examples:
|
|||
os.Exit(1)
|
||||
}
|
||||
beadsDir := filepath.Dir(dbPath)
|
||||
store, err = factory.NewFromConfigWithOptions(rootCtx, beadsDir, factory.Options{
|
||||
LockTimeout: lockTimeout,
|
||||
store, err = dolt.NewFromConfigWithOptions(rootCtx, beadsDir, &dolt.Config{
|
||||
OpenTimeout: lockTimeout,
|
||||
})
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: failed to open database: %v\n", err)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
storagefactory "github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
)
|
||||
|
|
@ -753,7 +753,7 @@ func checkBeadGate(ctx context.Context, awaitID string) (bool, string) {
|
|||
|
||||
// Open the target database (read-only) using storage factory
|
||||
// This supports both Dolt and legacy SQLite backends in the target rig.
|
||||
targetStore, err := storagefactory.NewFromConfigWithOptions(ctx, targetBeadsDir, storagefactory.Options{ReadOnly: true})
|
||||
targetStore, err := dolt.NewFromConfigWithOptions(ctx, targetBeadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return false, fmt.Sprintf("failed to open database for rig %q: %v", rigName, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import (
|
|||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/gitlab"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/tracker"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
|
@ -197,7 +197,7 @@ func getGitLabConfigValue(ctx context.Context, key string) string {
|
|||
return value
|
||||
}
|
||||
} else if dbPath != "" {
|
||||
tempStore, err := factory.NewWithOptions(ctx, configfile.BackendDolt, dbPath, factory.Options{LockTimeout: 5 * time.Second})
|
||||
tempStore, err := dolt.New(ctx, &dolt.Config{Path: dbPath, OpenTimeout: 5 * time.Second})
|
||||
if err == nil {
|
||||
defer func() { _ = tempStore.Close() }()
|
||||
value, _ := tempStore.GetConfig(ctx, key)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import (
|
|||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/git"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -362,7 +361,7 @@ func hookPreCommit() int {
|
|||
}
|
||||
|
||||
// Check if we're using Dolt backend - use branch-then-merge pattern
|
||||
backend := factory.GetBackendFromConfig(beadsDir)
|
||||
backend := dolt.GetBackendFromConfig(beadsDir)
|
||||
if backend == configfile.BackendDolt {
|
||||
exitCode := hookPreCommitDolt(beadsDir, worktreeRoot)
|
||||
if cfg.ChainStrategy == ChainAfter && exitCode == 0 {
|
||||
|
|
@ -582,7 +581,7 @@ func hookPostMerge(args []string) int {
|
|||
}
|
||||
|
||||
// Check if we're using Dolt backend - use branch-then-merge pattern
|
||||
backend := factory.GetBackendFromConfig(beadsDir)
|
||||
backend := dolt.GetBackendFromConfig(beadsDir)
|
||||
if backend == configfile.BackendDolt {
|
||||
exitCode := hookPostMergeDolt(beadsDir)
|
||||
if cfg.ChainStrategy == ChainAfter && exitCode == 0 {
|
||||
|
|
@ -771,7 +770,7 @@ func hookPostCheckout(args []string) int {
|
|||
}
|
||||
|
||||
// Check if we're using Dolt backend
|
||||
backend := factory.GetBackendFromConfig(beadsDir)
|
||||
backend := dolt.GetBackendFromConfig(beadsDir)
|
||||
if backend == configfile.BackendDolt {
|
||||
exitCode := hookPostMergeDolt(beadsDir) // Same as post-merge for Dolt
|
||||
// Update state after import
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import (
|
|||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/git"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/syncbranch"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
|
|
@ -353,7 +352,7 @@ enable server mode, or set connection details with --server-host, --server-port,
|
|||
dbName = "beads_" + prefix
|
||||
}
|
||||
var store *dolt.DoltStore
|
||||
store, err = factory.NewWithOptions(ctx, backend, storagePath, factory.Options{Database: dbName})
|
||||
store, err = dolt.New(ctx, &dolt.Config{Path: storagePath, Database: dbName})
|
||||
if err != nil {
|
||||
// If the backend requires CGO but this is a nocgo build, fall back to JSONL-only mode.
|
||||
// This enables Windows CI (CGO_ENABLED=0) and other pure-Go builds to use bd init.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/debug"
|
||||
"github.com/steveyegge/beads/internal/linear"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/tracker"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
|
@ -527,7 +527,7 @@ func getLinearConfig(ctx context.Context, key string) (value string, source stri
|
|||
return value, "project config (bd config)"
|
||||
}
|
||||
} else if dbPath != "" {
|
||||
tempStore, err := factory.NewWithOptions(ctx, configfile.BackendDolt, dbPath, factory.Options{LockTimeout: 5 * time.Second})
|
||||
tempStore, err := dolt.New(ctx, &dolt.Config{Path: dbPath, OpenTimeout: 5 * time.Second})
|
||||
if err == nil {
|
||||
defer func() { _ = tempStore.Close() }()
|
||||
value, _ = tempStore.GetConfig(ctx, key) // Best effort: empty value is valid fallback
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
"github.com/steveyegge/beads/internal/utils"
|
||||
|
|
@ -33,7 +33,7 @@ func withStorage(ctx context.Context, store *dolt.DoltStore, dbPath string, lock
|
|||
return fn(store)
|
||||
} else if dbPath != "" {
|
||||
// Daemon mode: open read-only connection
|
||||
roStore, err := factory.NewWithOptions(ctx, configfile.BackendDolt, dbPath, factory.Options{ReadOnly: true, LockTimeout: lockTimeout})
|
||||
roStore, err := dolt.New(ctx, &dolt.Config{Path: dbPath, ReadOnly: true, OpenTimeout: lockTimeout})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ var rootCmd = &cobra.Command{
|
|||
if isReadOnlyCommand(cmd.Name()) && beadsDir != "" {
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if _, err := os.Stat(jsonlPath); err == nil {
|
||||
configuredBackend := factory.GetBackendFromConfig(beadsDir)
|
||||
configuredBackend := dolt.GetBackendFromConfig(beadsDir)
|
||||
if configuredBackend == configfile.BackendDolt {
|
||||
// Dolt backend configured but database not found — don't auto-bootstrap
|
||||
fmt.Fprintf(os.Stderr, "Error: Dolt backend configured but database not found\n")
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
storagefactory "github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/syncbranch"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
|
|
@ -292,7 +292,7 @@ Subcommands:
|
|||
// Clean up WAL files before opening to avoid "disk I/O error"
|
||||
cleanupWALFiles(currentDB.path)
|
||||
|
||||
store, err := storagefactory.NewFromConfigWithOptions(rootCtx, beadsDir, storagefactory.Options{})
|
||||
store, err := dolt.NewFromConfig(rootCtx, beadsDir)
|
||||
if err != nil {
|
||||
if jsonOutput {
|
||||
outputJSON(map[string]interface{}{
|
||||
|
|
@ -452,7 +452,7 @@ func handleDoltMetadataUpdate(cfg *configfile.Config, beadsDir string, dryRun bo
|
|||
|
||||
// Open database using storage factory
|
||||
ctx := rootCtx
|
||||
store, err := storagefactory.NewFromConfigWithOptions(ctx, beadsDir, storagefactory.Options{})
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
if jsonOutput {
|
||||
outputJSON(map[string]interface{}{
|
||||
|
|
@ -738,7 +738,7 @@ func handleUpdateRepoID(dryRun bool, autoYes bool) {
|
|||
}
|
||||
|
||||
// Open database using storage factory (supports both SQLite and Dolt backends)
|
||||
store, err := storagefactory.NewFromConfigWithOptions(rootCtx, beadsDir, storagefactory.Options{})
|
||||
store, err := dolt.NewFromConfig(rootCtx, beadsDir)
|
||||
if err != nil {
|
||||
if jsonOutput {
|
||||
outputJSON(map[string]interface{}{
|
||||
|
|
@ -938,7 +938,7 @@ func handleInspect() {
|
|||
}
|
||||
|
||||
// Open database in read-only mode for inspection (supports both SQLite and Dolt)
|
||||
store, err := storagefactory.NewFromConfigWithOptions(rootCtx, beadsDir, storagefactory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(rootCtx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
if jsonOutput {
|
||||
outputJSON(map[string]interface{}{
|
||||
|
|
@ -1107,7 +1107,7 @@ func handleToSeparateBranch(branch string, dryRun bool) {
|
|||
}
|
||||
|
||||
// Open database (supports both SQLite and Dolt backends)
|
||||
store, err := storagefactory.NewFromConfigWithOptions(rootCtx, beadsDir, storagefactory.Options{})
|
||||
store, err := dolt.NewFromConfig(rootCtx, beadsDir)
|
||||
if err != nil {
|
||||
if jsonOutput {
|
||||
outputJSON(map[string]interface{}{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/git"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// setupDoltMigrateWorkspace creates a temp beads workspace with a Dolt database
|
||||
|
|
@ -51,7 +51,8 @@ func setupDoltMigrateWorkspace(t *testing.T) (string, string, *configfile.Config
|
|||
// Create the Dolt store via factory (bootstraps the database with schema)
|
||||
ctx := context.Background()
|
||||
doltPath := filepath.Join(beadsDir, "dolt")
|
||||
store, err := factory.NewWithOptions(ctx, configfile.BackendDolt, doltPath, factory.Options{
|
||||
store, err := dolt.New(ctx, &dolt.Config{
|
||||
Path: doltPath,
|
||||
Database: "beads",
|
||||
})
|
||||
if err != nil {
|
||||
|
|
@ -111,7 +112,7 @@ func TestMigrateDoltFullMetadata(t *testing.T) {
|
|||
|
||||
// Verify all 3 metadata fields were written
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store for verification: %v", err)
|
||||
}
|
||||
|
|
@ -170,7 +171,7 @@ func TestMigrateDoltMetadataIdempotent(t *testing.T) {
|
|||
|
||||
// Read original values
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to open store: %v", err)
|
||||
}
|
||||
|
|
@ -191,7 +192,7 @@ func TestMigrateDoltMetadataIdempotent(t *testing.T) {
|
|||
handleDoltMetadataUpdate(cfg, beadsDir, false)
|
||||
|
||||
// Verify values did not change
|
||||
store2, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store2, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store: %v", err)
|
||||
}
|
||||
|
|
@ -241,7 +242,7 @@ func TestMigrateDoltMetadataPartial(t *testing.T) {
|
|||
// Pre-set only bd_version (simulate a pre-Phase-3 database that has
|
||||
// already been migrated for version but not for identity fields)
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to open store: %v", err)
|
||||
}
|
||||
|
|
@ -255,7 +256,7 @@ func TestMigrateDoltMetadataPartial(t *testing.T) {
|
|||
handleDoltMetadataUpdate(cfg, beadsDir, false)
|
||||
|
||||
// Verify: bd_version should remain as Version (not overwritten)
|
||||
store2, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store2, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to reopen store: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import (
|
|||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
)
|
||||
|
|
@ -98,7 +97,7 @@ Examples:
|
|||
|
||||
// Step 4: Open storage for the target rig
|
||||
// Use factory to respect backend configuration (bd-m2jr: SQLite fallback fix)
|
||||
targetStore, err := factory.NewFromConfig(ctx, targetBeadsDir)
|
||||
targetStore, err := dolt.NewFromConfig(ctx, targetBeadsDir)
|
||||
if err != nil {
|
||||
FatalError("failed to open target rig database: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
func TestExtractIssuePrefix(t *testing.T) {
|
||||
|
|
@ -97,124 +93,7 @@ func TestLoadIssuesFromJSONL_NonExistent(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestDetectPrefix(t *testing.T) {
|
||||
tempDir := t.TempDir()
|
||||
beadsDir := filepath.Join(tempDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0o755); err != nil {
|
||||
t.Fatalf("Failed to create .beads dir: %v", err)
|
||||
}
|
||||
|
||||
t.Run("from existing issues", func(t *testing.T) {
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
|
||||
// Add issues with common prefix
|
||||
issues := []*types.Issue{
|
||||
{ID: "myapp-1", Title: "Issue 1"},
|
||||
{ID: "myapp-2", Title: "Issue 2"},
|
||||
}
|
||||
if err := memStore.LoadFromIssues(issues); err != nil {
|
||||
t.Fatalf("Failed to load issues: %v", err)
|
||||
}
|
||||
|
||||
prefix, err := detectPrefix(beadsDir, memStore)
|
||||
if err != nil {
|
||||
t.Fatalf("detectPrefix failed: %v", err)
|
||||
}
|
||||
if prefix != "myapp" {
|
||||
t.Errorf("Expected prefix 'myapp', got '%s'", prefix)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("mixed prefixes error", func(t *testing.T) {
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
|
||||
issues := []*types.Issue{
|
||||
{ID: "app1-1", Title: "Issue 1"},
|
||||
{ID: "app2-2", Title: "Issue 2"},
|
||||
}
|
||||
if err := memStore.LoadFromIssues(issues); err != nil {
|
||||
t.Fatalf("Failed to load issues: %v", err)
|
||||
}
|
||||
|
||||
_, err := detectPrefix(beadsDir, memStore)
|
||||
if err == nil {
|
||||
t.Error("Expected error for mixed prefixes, got nil")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("empty database defaults to dir name", func(t *testing.T) {
|
||||
// Change to temp dir so we can control directory name
|
||||
namedDir := filepath.Join(tempDir, "myproject")
|
||||
if err := os.MkdirAll(namedDir, 0o755); err != nil {
|
||||
t.Fatalf("Failed to create named dir: %v", err)
|
||||
}
|
||||
t.Chdir(namedDir)
|
||||
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
prefix, err := detectPrefix(beadsDir, memStore)
|
||||
if err != nil {
|
||||
t.Fatalf("detectPrefix failed: %v", err)
|
||||
}
|
||||
if prefix != "myproject" {
|
||||
t.Errorf("Expected prefix 'myproject', got '%s'", prefix)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("config override", func(t *testing.T) {
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
prev := config.GetString("issue-prefix")
|
||||
config.Set("issue-prefix", "custom-prefix")
|
||||
t.Cleanup(func() { config.Set("issue-prefix", prev) })
|
||||
|
||||
prefix, err := detectPrefix(beadsDir, memStore)
|
||||
if err != nil {
|
||||
t.Fatalf("detectPrefix failed: %v", err)
|
||||
}
|
||||
if prefix != "custom-prefix" {
|
||||
t.Errorf("Expected config override prefix, got %q", prefix)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("sanitizes directory names", func(t *testing.T) {
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
weirdDir := filepath.Join(tempDir, "My Project!!!")
|
||||
if err := os.MkdirAll(weirdDir, 0o755); err != nil {
|
||||
t.Fatalf("Failed to create dir: %v", err)
|
||||
}
|
||||
t.Chdir(weirdDir)
|
||||
prev := config.GetString("issue-prefix")
|
||||
config.Set("issue-prefix", "")
|
||||
t.Cleanup(func() { config.Set("issue-prefix", prev) })
|
||||
|
||||
prefix, err := detectPrefix(beadsDir, memStore)
|
||||
if err != nil {
|
||||
t.Fatalf("detectPrefix failed: %v", err)
|
||||
}
|
||||
if prefix != "myproject" {
|
||||
t.Errorf("Expected sanitized prefix 'myproject', got %q", prefix)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("invalid directory falls back to bd", func(t *testing.T) {
|
||||
memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
|
||||
emptyDir := filepath.Join(tempDir, "!!!")
|
||||
if err := os.MkdirAll(emptyDir, 0o755); err != nil {
|
||||
t.Fatalf("Failed to create dir: %v", err)
|
||||
}
|
||||
t.Chdir(emptyDir)
|
||||
prev := config.GetString("issue-prefix")
|
||||
config.Set("issue-prefix", "")
|
||||
t.Cleanup(func() { config.Set("issue-prefix", prev) })
|
||||
|
||||
prefix, err := detectPrefix(beadsDir, memStore)
|
||||
if err != nil {
|
||||
t.Fatalf("detectPrefix failed: %v", err)
|
||||
}
|
||||
if prefix != "bd" {
|
||||
t.Errorf("Expected fallback prefix 'bd', got %q", prefix)
|
||||
}
|
||||
})
|
||||
}
|
||||
// NOTE: TestDetectPrefix was removed because it referenced the deleted memory backend and the detectPrefix function which no longer exists.
|
||||
|
||||
func TestInitializeNoDbMode_SetsStoreActive(t *testing.T) {
|
||||
// This test verifies the fix for bd comment --no-db not working.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/ui"
|
||||
)
|
||||
|
|
@ -77,8 +77,7 @@ Examples:
|
|||
}
|
||||
|
||||
// Step 4: Open storage for the target rig
|
||||
// Use factory to respect backend configuration (bd-m2jr: SQLite fallback fix)
|
||||
targetStore, err := factory.NewFromConfig(ctx, targetBeadsDir)
|
||||
targetStore, err := dolt.NewFromConfig(ctx, targetBeadsDir)
|
||||
if err != nil {
|
||||
FatalError("failed to open target rig database: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
//go:build cgo
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
@ -5,21 +7,12 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
func TestRepairDeps_NoOrphans(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
jsonlPath := filepath.Join(dir, "issues.jsonl")
|
||||
|
||||
store := memory.New(jsonlPath)
|
||||
defer store.Close()
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
// Initialize store
|
||||
store.SetConfig(ctx, "issue_prefix", "test")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Create two issues with valid dependency
|
||||
i1 := &types.Issue{Title: "Issue 1", Priority: 1, Status: "open", IssueType: "task"}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import (
|
|||
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/utils"
|
||||
)
|
||||
|
|
@ -58,8 +57,8 @@ func resolveAndGetIssueWithRouting(ctx context.Context, localStore *dolt.DoltSto
|
|||
}
|
||||
|
||||
beadsDir := filepath.Dir(dbPath)
|
||||
// Use factory.NewFromConfig as the storage opener to respect backend configuration
|
||||
routedStorage, err := routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, factory.NewFromConfig)
|
||||
// Use dolt.NewFromConfig as the storage opener to respect backend configuration
|
||||
routedStorage, err := routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, dolt.NewFromConfig)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -121,7 +120,7 @@ func openStoreForRig(ctx context.Context, rigOrPrefix string) (*dolt.DoltStore,
|
|||
return nil, err
|
||||
}
|
||||
|
||||
targetStore, err := factory.NewFromConfigWithOptions(ctx, targetBeadsDir, factory.Options{ReadOnly: true})
|
||||
targetStore, err := dolt.NewFromConfigWithOptions(ctx, targetBeadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to open rig %q database: %v", rigOrPrefix, err)
|
||||
}
|
||||
|
|
@ -159,8 +158,8 @@ func getIssueWithRouting(ctx context.Context, localStore *dolt.DoltStore, id str
|
|||
}
|
||||
|
||||
beadsDir := filepath.Dir(dbPath)
|
||||
// Use GetRoutedStorageWithOpener with factory to respect backend configuration (bd-m2jr)
|
||||
routedStorage, routeErr := routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, factory.NewFromConfig)
|
||||
// Use GetRoutedStorageWithOpener with dolt to respect backend configuration (bd-m2jr)
|
||||
routedStorage, routeErr := routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, dolt.NewFromConfig)
|
||||
if routeErr != nil || routedStorage == nil {
|
||||
// No routing found or error - return original result
|
||||
return &RoutedResult{
|
||||
|
|
@ -203,8 +202,8 @@ func getRoutedStoreForID(ctx context.Context, id string) (*routing.RoutedStorage
|
|||
}
|
||||
|
||||
beadsDir := filepath.Dir(dbPath)
|
||||
// Use GetRoutedStorageWithOpener with factory to respect backend configuration (bd-m2jr)
|
||||
return routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, factory.NewFromConfig)
|
||||
// Use GetRoutedStorageWithOpener with dolt to respect backend configuration (bd-m2jr)
|
||||
return routing.GetRoutedStorageWithOpener(ctx, id, beadsDir, dolt.NewFromConfig)
|
||||
}
|
||||
|
||||
// needsRouting checks if an ID would be routed to a different beads directory.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
//go:build cgo
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
|
|
@ -37,10 +39,7 @@ func TestValidateIssueClosable(t *testing.T) {
|
|||
|
||||
func TestApplyLabelUpdates_SetAddRemove(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
st := memory.New("")
|
||||
if err := st.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("SetConfig: %v", err)
|
||||
}
|
||||
st := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
issue := &types.Issue{Title: "x", Status: types.StatusOpen, Priority: 2, IssueType: types.TypeTask}
|
||||
if err := st.CreateIssue(ctx, issue, "tester"); err != nil {
|
||||
|
|
@ -78,7 +77,7 @@ func TestApplyLabelUpdates_SetAddRemove(t *testing.T) {
|
|||
|
||||
func TestApplyLabelUpdates_AddRemoveOnly(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
st := memory.New("")
|
||||
st := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
issue := &types.Issue{Title: "x", Status: types.StatusOpen, Priority: 2, IssueType: types.TypeTask}
|
||||
if err := st.CreateIssue(ctx, issue, "tester"); err != nil {
|
||||
t.Fatalf("CreateIssue: %v", err)
|
||||
|
|
@ -94,16 +93,9 @@ func TestApplyLabelUpdates_AddRemoveOnly(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestFindRepliesToAndReplies_WorksWithMemoryStorage(t *testing.T) {
|
||||
func TestFindRepliesToAndReplies_WorksWithDoltStorage(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
st := memory.New("")
|
||||
if err := st.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("SetConfig: %v", err)
|
||||
}
|
||||
// Configure Gas Town custom types for test compatibility (bd-find4)
|
||||
if err := st.SetConfig(ctx, "types.custom", "message"); err != nil {
|
||||
t.Fatalf("SetConfig types.custom: %v", err)
|
||||
}
|
||||
st := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
root := &types.Issue{Title: "root", Status: types.StatusOpen, Priority: 2, IssueType: "message", Sender: "a", Assignee: "b"}
|
||||
reply1 := &types.Issue{Title: "r1", Status: types.StatusOpen, Priority: 2, IssueType: "message", Sender: "b", Assignee: "a"}
|
||||
|
|
|
|||
|
|
@ -4,18 +4,10 @@ package main
|
|||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/storage"
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
// resetConfigForRemoteTest clears viper config state without loading
|
||||
|
|
@ -27,458 +19,16 @@ func resetConfigForRemoteTest(t *testing.T) {
|
|||
t.Cleanup(config.ResetForTesting)
|
||||
}
|
||||
|
||||
// mockRemoteStore wraps a MemoryStorage to implement RemoteStorage.
|
||||
// Tracks Push/Pull/Commit calls for verification.
|
||||
type mockRemoteStore struct {
|
||||
*memory.MemoryStorage
|
||||
|
||||
pushCount atomic.Int32
|
||||
pullCount atomic.Int32
|
||||
commitMsgs []string
|
||||
|
||||
pushErr error // inject Push error
|
||||
pullErr error // inject Pull error
|
||||
}
|
||||
|
||||
// Compile-time check: mockRemoteStore implements RemoteStorage.
|
||||
var _ storage.RemoteStorage = (*mockRemoteStore)(nil)
|
||||
|
||||
func newMockRemoteStore() *mockRemoteStore {
|
||||
return &mockRemoteStore{
|
||||
MemoryStorage: memory.New(""),
|
||||
}
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Push(_ context.Context) error {
|
||||
m.pushCount.Add(1)
|
||||
return m.pushErr
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Pull(_ context.Context) error {
|
||||
m.pullCount.Add(1)
|
||||
return m.pullErr
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) AddRemote(_ context.Context, _, _ string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// VersionedStorage stubs — dolt-native sync only needs Push/Pull/Commit.
|
||||
|
||||
func (m *mockRemoteStore) History(_ context.Context, _ string) ([]*storage.HistoryEntry, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) AsOf(_ context.Context, _ string, _ string) (*types.Issue, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Diff(_ context.Context, _, _ string) ([]*storage.DiffEntry, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Branch(_ context.Context, _ string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Merge(_ context.Context, _ string) ([]storage.Conflict, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) CurrentBranch(_ context.Context) (string, error) {
|
||||
return "main", nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) ListBranches(_ context.Context) ([]string, error) {
|
||||
return []string{"main"}, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) Commit(_ context.Context, msg string) error {
|
||||
m.commitMsgs = append(m.commitMsgs, msg)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) GetCurrentCommit(_ context.Context) (string, error) {
|
||||
return "abc123", nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) GetConflicts(_ context.Context) ([]storage.Conflict, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *mockRemoteStore) ResolveConflicts(_ context.Context, _ string, _ string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TestDoExportSync_DoltNative_CallsPush verifies that doExportSync in dolt-native
|
||||
// mode calls store.Commit then store.Push through the RemoteStorage interface,
|
||||
// and does NOT write JSONL.
|
||||
func TestDoExportSync_DoltNative_CallsPush(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir := t.TempDir()
|
||||
|
||||
// Create .beads directory with empty JSONL
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
// Save and restore globals
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
// Create mock remote store and set dolt-native mode
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, SyncModeDoltNative); err != nil {
|
||||
t.Fatalf("set sync mode: %v", err)
|
||||
}
|
||||
|
||||
// Install mock as global store
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
// Reset viper to prevent config.yaml sync.mode from overriding DB config
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
// Verify preconditions
|
||||
mode := GetSyncMode(ctx, mock)
|
||||
if mode != SyncModeDoltNative {
|
||||
t.Fatalf("sync mode = %q, want %q", mode, SyncModeDoltNative)
|
||||
}
|
||||
if !ShouldUseDoltRemote(ctx, mock) {
|
||||
t.Fatal("ShouldUseDoltRemote should be true for dolt-native")
|
||||
}
|
||||
if ShouldExportJSONL(ctx, mock) {
|
||||
t.Fatal("ShouldExportJSONL should be false for dolt-native")
|
||||
}
|
||||
|
||||
// Run doExportSync
|
||||
if err := doExportSync(ctx, jsonlPath, false, false); err != nil {
|
||||
t.Fatalf("doExportSync failed: %v", err)
|
||||
}
|
||||
|
||||
// Verify Push was called
|
||||
if mock.pushCount.Load() != 1 {
|
||||
t.Errorf("Push called %d times, want 1", mock.pushCount.Load())
|
||||
}
|
||||
|
||||
// Verify Commit was called (doExportSync commits before push)
|
||||
if len(mock.commitMsgs) != 1 {
|
||||
t.Errorf("Commit called %d times, want 1", len(mock.commitMsgs))
|
||||
}
|
||||
|
||||
// Verify JSONL was NOT written (should still be empty)
|
||||
content, err := os.ReadFile(jsonlPath)
|
||||
if err != nil {
|
||||
t.Fatalf("read JSONL: %v", err)
|
||||
}
|
||||
if len(content) > 0 {
|
||||
t.Errorf("JSONL should be empty in dolt-native mode, got %d bytes", len(content))
|
||||
}
|
||||
}
|
||||
|
||||
// TestDoExportSync_BeltAndSuspenders_DoesBoth verifies that belt-and-suspenders
|
||||
// mode calls both Dolt Push AND exports JSONL.
|
||||
func TestDoExportSync_BeltAndSuspenders_DoesBoth(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir := t.TempDir()
|
||||
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, SyncModeBeltAndSuspenders); err != nil {
|
||||
t.Fatalf("set sync mode: %v", err)
|
||||
}
|
||||
|
||||
// Create an issue so JSONL export has something to write
|
||||
issue := &types.Issue{
|
||||
ID: "test-1",
|
||||
Title: "Belt Test",
|
||||
Status: types.StatusOpen,
|
||||
IssueType: types.TypeTask,
|
||||
Priority: 2,
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
}
|
||||
if err := mock.CreateIssue(ctx, issue, "test"); err != nil {
|
||||
t.Fatalf("create issue: %v", err)
|
||||
}
|
||||
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
// Verify preconditions
|
||||
if !ShouldUseDoltRemote(ctx, mock) {
|
||||
t.Fatal("ShouldUseDoltRemote should be true for belt-and-suspenders")
|
||||
}
|
||||
if !ShouldExportJSONL(ctx, mock) {
|
||||
t.Fatal("ShouldExportJSONL should be true for belt-and-suspenders")
|
||||
}
|
||||
|
||||
if err := doExportSync(ctx, jsonlPath, false, false); err != nil {
|
||||
t.Fatalf("doExportSync failed: %v", err)
|
||||
}
|
||||
|
||||
// Verify Push was called
|
||||
if mock.pushCount.Load() != 1 {
|
||||
t.Errorf("Push called %d times, want 1", mock.pushCount.Load())
|
||||
}
|
||||
|
||||
// Verify JSONL was also written (belt-and-suspenders does both)
|
||||
content, err := os.ReadFile(jsonlPath)
|
||||
if err != nil {
|
||||
t.Fatalf("read JSONL: %v", err)
|
||||
}
|
||||
if len(content) == 0 {
|
||||
t.Error("JSONL should be non-empty in belt-and-suspenders mode")
|
||||
}
|
||||
if !strings.Contains(string(content), "test-1") {
|
||||
t.Error("JSONL should contain exported issue test-1")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDoExportSync_GitPortable_NoPush verifies that git-portable mode does NOT
|
||||
// call Dolt Push (it only writes JSONL).
|
||||
func TestDoExportSync_GitPortable_NoPush(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir := t.TempDir()
|
||||
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
// Default mode is git-portable (no sync.mode config set)
|
||||
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
// Verify preconditions
|
||||
if ShouldUseDoltRemote(ctx, mock) {
|
||||
t.Fatal("ShouldUseDoltRemote should be false for git-portable")
|
||||
}
|
||||
|
||||
if err := doExportSync(ctx, jsonlPath, false, false); err != nil {
|
||||
t.Fatalf("doExportSync failed: %v", err)
|
||||
}
|
||||
|
||||
// Verify Push was NOT called
|
||||
if mock.pushCount.Load() != 0 {
|
||||
t.Errorf("Push called %d times, want 0 for git-portable", mock.pushCount.Load())
|
||||
}
|
||||
}
|
||||
|
||||
// TestDoPullFirstSync_DoltNative_CallsPull verifies that doPullFirstSync in
|
||||
// dolt-native mode calls store.Pull and then returns early (no JSONL merge).
|
||||
func TestDoPullFirstSync_DoltNative_CallsPull(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
// Setup git repo (doPullFirstSync checks git state)
|
||||
tmpDir, cleanup := setupGitRepo(t)
|
||||
defer cleanup()
|
||||
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
// Commit .beads so git status is clean
|
||||
_ = exec.Command("git", "add", ".beads").Run()
|
||||
_ = exec.Command("git", "commit", "-m", "add beads dir").Run()
|
||||
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, SyncModeDoltNative); err != nil {
|
||||
t.Fatalf("set sync mode: %v", err)
|
||||
}
|
||||
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
sbc := &SyncBranchContext{} // no sync branch configured
|
||||
|
||||
// Run pull-first sync
|
||||
err := doPullFirstSync(ctx, jsonlPath, false, false, false, true, false, "", false, sbc)
|
||||
if err != nil {
|
||||
t.Fatalf("doPullFirstSync failed: %v", err)
|
||||
}
|
||||
|
||||
// Verify Pull was called
|
||||
if mock.pullCount.Load() != 1 {
|
||||
t.Errorf("Pull called %d times, want 1", mock.pullCount.Load())
|
||||
}
|
||||
|
||||
// Verify JSONL was NOT modified (dolt-native returns early after pull)
|
||||
content, err := os.ReadFile(jsonlPath)
|
||||
if err != nil {
|
||||
t.Fatalf("read JSONL: %v", err)
|
||||
}
|
||||
if len(content) > 0 {
|
||||
t.Errorf("JSONL should remain empty in dolt-native mode, got %d bytes", len(content))
|
||||
}
|
||||
}
|
||||
|
||||
// TestDoPullFirstSync_DoltNative_PullError verifies that dolt-native mode
|
||||
// propagates Pull errors (except "no remote" warnings).
|
||||
func TestDoPullFirstSync_DoltNative_PullError(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
tmpDir, cleanup := setupGitRepo(t)
|
||||
defer cleanup()
|
||||
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
_ = exec.Command("git", "add", ".beads").Run()
|
||||
_ = exec.Command("git", "commit", "-m", "add beads dir").Run()
|
||||
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, SyncModeDoltNative); err != nil {
|
||||
t.Fatalf("set sync mode: %v", err)
|
||||
}
|
||||
|
||||
// Inject a non-remote error
|
||||
mock.pullErr = os.ErrPermission
|
||||
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
sbc := &SyncBranchContext{}
|
||||
|
||||
err := doPullFirstSync(ctx, jsonlPath, false, false, false, true, false, "", false, sbc)
|
||||
if err == nil {
|
||||
t.Fatal("expected error from Pull, got nil")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "dolt pull failed") {
|
||||
t.Errorf("expected 'dolt pull failed' error, got: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestDoExportSync_DoltNative_NoRemote verifies that dolt-native mode handles
|
||||
// "no remote configured" gracefully (warns but doesn't fail).
|
||||
func TestDoExportSync_DoltNative_NoRemote(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
tmpDir := t.TempDir()
|
||||
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
if err := os.MkdirAll(beadsDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir failed: %v", err)
|
||||
}
|
||||
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(jsonlPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write JSONL failed: %v", err)
|
||||
}
|
||||
|
||||
saveAndRestoreGlobals(t)
|
||||
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, "issue_prefix", "test"); err != nil {
|
||||
t.Fatalf("set issue_prefix: %v", err)
|
||||
}
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, SyncModeDoltNative); err != nil {
|
||||
t.Fatalf("set sync mode: %v", err)
|
||||
}
|
||||
|
||||
// Inject "no remote" error — doExportSync checks if error contains "remote"
|
||||
// to decide whether to warn vs fail.
|
||||
mock.pushErr = &remoteNotConfiguredError{}
|
||||
|
||||
store = mock
|
||||
storeMutex.Lock()
|
||||
storeActive = true
|
||||
storeMutex.Unlock()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
err := doExportSync(ctx, jsonlPath, false, false)
|
||||
if err != nil {
|
||||
t.Fatalf("doExportSync should not fail for missing remote, got: %v", err)
|
||||
}
|
||||
|
||||
// Push was attempted
|
||||
if mock.pushCount.Load() != 1 {
|
||||
t.Errorf("Push called %d times, want 1", mock.pushCount.Load())
|
||||
}
|
||||
}
|
||||
|
||||
// remoteNotConfiguredError is a test error whose message contains "remote"
|
||||
// to trigger the graceful handling in doExportSync.
|
||||
type remoteNotConfiguredError struct{}
|
||||
|
||||
func (e *remoteNotConfiguredError) Error() string {
|
||||
return "no remote configured"
|
||||
}
|
||||
|
||||
// TestShouldUseDoltRemote_ModeSelection verifies the mode → Dolt remote mapping
|
||||
// using the in-memory mock (no Dolt required).
|
||||
// NOTE: TestDoExportSync_*, TestDoPullFirstSync_*, and TestRemoteStorageInterfaceCheck
|
||||
// were removed because they depended on the memory backend's mockRemoteStore pattern
|
||||
// for Push/Pull error injection. With the dolt-native migration (Phase 7), the global
|
||||
// store is *dolt.DoltStore which doesn't support mock injection. Sync mode functionality
|
||||
// is tested through integration tests with real dolt remotes.
|
||||
|
||||
// TestShouldUseDoltRemote_ModeSelection verifies the mode -> Dolt remote mapping
|
||||
// using a real dolt store.
|
||||
func TestShouldUseDoltRemote_ModeSelection(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
tests := []struct {
|
||||
|
|
@ -493,12 +43,12 @@ func TestShouldUseDoltRemote_ModeSelection(t *testing.T) {
|
|||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.mode, func(t *testing.T) {
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, tt.mode); err != nil {
|
||||
testStore := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
if err := testStore.SetConfig(ctx, SyncModeConfigKey, tt.mode); err != nil {
|
||||
t.Fatalf("set mode: %v", err)
|
||||
}
|
||||
|
||||
got := ShouldUseDoltRemote(ctx, mock)
|
||||
got := ShouldUseDoltRemote(ctx, testStore)
|
||||
if got != tt.wantUse {
|
||||
t.Errorf("ShouldUseDoltRemote() = %v, want %v", got, tt.wantUse)
|
||||
}
|
||||
|
|
@ -507,10 +57,9 @@ func TestShouldUseDoltRemote_ModeSelection(t *testing.T) {
|
|||
}
|
||||
|
||||
// TestShouldExportJSONL_DoltNative_False verifies that JSONL export is disabled
|
||||
// in dolt-native mode using the mock (no Dolt required).
|
||||
// in dolt-native mode using a real dolt store.
|
||||
func TestShouldExportJSONL_DoltNative_False(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
resetConfigForRemoteTest(t)
|
||||
|
||||
tests := []struct {
|
||||
|
|
@ -525,39 +74,15 @@ func TestShouldExportJSONL_DoltNative_False(t *testing.T) {
|
|||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.mode, func(t *testing.T) {
|
||||
mock := newMockRemoteStore()
|
||||
if err := mock.SetConfig(ctx, SyncModeConfigKey, tt.mode); err != nil {
|
||||
testStore := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
if err := testStore.SetConfig(ctx, SyncModeConfigKey, tt.mode); err != nil {
|
||||
t.Fatalf("set mode: %v", err)
|
||||
}
|
||||
|
||||
got := ShouldExportJSONL(ctx, mock)
|
||||
got := ShouldExportJSONL(ctx, testStore)
|
||||
if got != tt.wantExport {
|
||||
t.Errorf("ShouldExportJSONL() = %v, want %v", got, tt.wantExport)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestRemoteStorageInterfaceCheck verifies that storage.AsRemote correctly
|
||||
// detects RemoteStorage implementations.
|
||||
func TestRemoteStorageInterfaceCheck(t *testing.T) {
|
||||
// mockRemoteStore should implement RemoteStorage
|
||||
mock := newMockRemoteStore()
|
||||
if !storage.IsRemote(mock) {
|
||||
t.Error("mockRemoteStore should implement RemoteStorage")
|
||||
}
|
||||
rs, ok := storage.AsRemote(mock)
|
||||
if !ok || rs == nil {
|
||||
t.Error("AsRemote should succeed for mockRemoteStore")
|
||||
}
|
||||
|
||||
// Plain MemoryStorage should NOT implement RemoteStorage
|
||||
mem := memory.New("")
|
||||
if storage.IsRemote(mem) {
|
||||
t.Error("MemoryStorage should NOT implement RemoteStorage")
|
||||
}
|
||||
_, ok = storage.AsRemote(mem)
|
||||
if ok {
|
||||
t.Error("AsRemote should fail for MemoryStorage")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
)
|
||||
|
||||
// Sync mode constants - re-exported from internal/config for backward compatibility.
|
||||
// These are used with storage.Storage (database) while config.SyncMode* are used
|
||||
// These are used with *dolt.DoltStore (database) while config.SyncMode* are used
|
||||
// with viper (config.yaml).
|
||||
const (
|
||||
// SyncModeGitPortable exports to JSONL on push, imports on pull.
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
//go:build cgo
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
)
|
||||
|
||||
func TestTipSelection(t *testing.T) {
|
||||
|
|
@ -24,7 +25,7 @@ func TestTipSelection(t *testing.T) {
|
|||
tips = []Tip{}
|
||||
tipsMutex.Unlock()
|
||||
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Test 1: No tips registered
|
||||
tip := selectNextTip(store)
|
||||
|
|
@ -131,7 +132,7 @@ func TestTipProbability(t *testing.T) {
|
|||
}
|
||||
tipsMutex.Unlock()
|
||||
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Run selection multiple times
|
||||
shownCount := 0
|
||||
|
|
@ -153,7 +154,7 @@ func TestTipProbability(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestGetLastShown(t *testing.T) {
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Test 1: Never shown
|
||||
lastShown := getLastShown(store, "never_shown")
|
||||
|
|
@ -181,7 +182,7 @@ func TestGetLastShown(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestRecordTipShown(t *testing.T) {
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
recordTipShown(store, "test_tip")
|
||||
|
||||
|
|
@ -215,7 +216,7 @@ func TestMaybeShowTip_RespectsFlags(t *testing.T) {
|
|||
}
|
||||
tipsMutex.Unlock()
|
||||
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Test 1: Should not show in JSON mode
|
||||
jsonOutput = true
|
||||
|
|
@ -232,7 +233,7 @@ func TestMaybeShowTip_RespectsFlags(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestTipFrequency(t *testing.T) {
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
tipsMutex.Lock()
|
||||
tips = []Tip{
|
||||
|
|
@ -279,7 +280,7 @@ func TestInjectTip(t *testing.T) {
|
|||
tips = []Tip{}
|
||||
tipsMutex.Unlock()
|
||||
|
||||
store := memory.New("")
|
||||
store := newTestStoreWithPrefix(t, filepath.Join(t.TempDir(), "test.db"), "test")
|
||||
|
||||
// Set deterministic seed for testing
|
||||
os.Setenv("BEADS_TIP_SEED", "11111")
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import (
|
|||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
"github.com/steveyegge/beads/internal/debug"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
)
|
||||
|
||||
// localVersionFile is the gitignored file that stores the last bd version used locally.
|
||||
|
|
@ -206,7 +206,7 @@ func findActualJSONLFile(beadsDir string) string {
|
|||
// IMPORTANT: This must be called AFTER determining we're in direct mode (no daemon)
|
||||
// and BEFORE opening the database, to avoid: 1) conflicts with daemon, 2) opening DB twice.
|
||||
//
|
||||
// beadsDir is the path to the .beads directory. The function uses factory.NewFromConfig
|
||||
// beadsDir is the path to the .beads directory. The function uses dolt.NewFromConfig
|
||||
// to open the correct backend (SQLite or Dolt) based on metadata.json configuration.
|
||||
func autoMigrateOnVersionBump(beadsDir string) {
|
||||
// Only migrate if version upgrade was detected
|
||||
|
|
@ -246,7 +246,7 @@ func autoMigrateOnVersionBump(beadsDir string) {
|
|||
ctx = context.Background()
|
||||
}
|
||||
|
||||
store, err := factory.NewFromConfig(ctx, beadsDir)
|
||||
store, err := dolt.NewFromConfig(ctx, beadsDir)
|
||||
if err != nil {
|
||||
// Failed to open database - skip migration
|
||||
debug.Logf("auto-migrate: failed to open database: %v", err)
|
||||
|
|
|
|||
|
|
@ -429,6 +429,6 @@ func TestAutoMigrateOnVersionBump_NoDatabase(t *testing.T) {
|
|||
// NOTE: TestAutoMigrateOnVersionBump_MigratesVersion, TestAutoMigrateOnVersionBump_AlreadyMigrated,
|
||||
// TestAutoMigrateOnVersionBump_RefusesDowngrade, and TestAutoMigrateOnVersionBump_TracksMaxVersion
|
||||
// were removed because they depended on the SQLite storage backend (sqlite.New) for round-trip
|
||||
// persistence testing through autoMigrateOnVersionBump -> factory.NewFromConfig.
|
||||
// persistence testing through autoMigrateOnVersionBump -> dolt.NewFromConfig.
|
||||
// Since SQLite support has been removed, auto-migration is only exercised with Dolt backends.
|
||||
// Dolt-based migration testing is covered by TestInitDoltMetadata in init_test.go.
|
||||
|
|
|
|||
|
|
@ -372,12 +372,10 @@ type Storage = *dolt.DoltStore
|
|||
type Transaction = storage.Transaction
|
||||
|
||||
// NewStorage opens a bd database for programmatic access.
|
||||
// Deprecated: callers should use storage/factory package to respect backend configuration.
|
||||
// Deprecated: callers should use dolt.New() or dolt.NewFromConfig() directly.
|
||||
// This function is retained for backward compatibility but will be removed in a future release.
|
||||
func NewStorage(ctx context.Context, dbPath string) (Storage, error) {
|
||||
// Cannot use factory here due to import cycle (beads -> factory -> beads).
|
||||
// Callers should use storage/factory.New() directly instead.
|
||||
return nil, fmt.Errorf("NewStorage is deprecated: use storage/factory.New() to create storage backends")
|
||||
return dolt.New(ctx, &dolt.Config{Path: dbPath})
|
||||
}
|
||||
|
||||
// GetConfiguredBackend returns the backend type from the beads directory config.
|
||||
|
|
@ -728,9 +726,8 @@ func FindAllDatabases() []DatabaseInfo {
|
|||
// Don't fail if we can't open/query the database - it might be locked
|
||||
// or corrupted, but we still want to detect and warn about it
|
||||
//
|
||||
// Note: Issue counting requires storage/factory which cannot be imported
|
||||
// here due to import cycle constraints. Callers needing issue counts
|
||||
// should use storage/factory directly.
|
||||
// Note: Issue counting requires opening a dolt store which is already
|
||||
// imported here. Callers needing issue counts can use dolt.New() directly.
|
||||
|
||||
databases = append(databases, DatabaseInfo{
|
||||
Path: dbPath,
|
||||
|
|
|
|||
|
|
@ -625,7 +625,7 @@ func TestFindBeadsDir_BEADS_DIR_WithProjectFiles(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// TestNewStorage_Unit tests that deprecated NewStorage returns an error directing callers to factory.New
|
||||
// TestNewStorage_Unit tests that deprecated NewStorage creates a dolt store
|
||||
func TestNewStorage_Unit(t *testing.T) {
|
||||
tmpDir := t.TempDir()
|
||||
dbPath := filepath.Join(tmpDir, "test.db")
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ func BuildStateCacheFromTracker(ctx context.Context, t *Tracker) (*StateCache, e
|
|||
return BuildStateCache(ctx, t.client)
|
||||
}
|
||||
|
||||
// configLoaderAdapter wraps storage.Storage to implement linear.ConfigLoader.
|
||||
// configLoaderAdapter wraps *dolt.DoltStore to implement linear.ConfigLoader.
|
||||
type configLoaderAdapter struct {
|
||||
ctx context.Context
|
||||
store *dolt.DoltStore
|
||||
|
|
|
|||
|
|
@ -12,11 +12,8 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/beads/internal/audit"
|
||||
"github.com/steveyegge/beads/internal/lockfile"
|
||||
"github.com/steveyegge/beads/internal/routing"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
"github.com/steveyegge/beads/internal/utils"
|
||||
)
|
||||
|
||||
// BootstrapResult contains statistics about the bootstrap operation
|
||||
|
|
@ -36,12 +33,43 @@ type ParseError struct {
|
|||
Snippet string
|
||||
}
|
||||
|
||||
// BootstrapRoute holds route data for bootstrap import.
|
||||
// This is a local type to avoid importing internal/routing (which imports dolt, causing a cycle).
|
||||
type BootstrapRoute struct {
|
||||
Prefix string
|
||||
Path string
|
||||
}
|
||||
|
||||
// bootstrapInteractionEntry is a local type for deserializing interactions.jsonl entries.
|
||||
// Avoids importing internal/audit (which imports internal/beads → dolt, causing a cycle).
|
||||
type bootstrapInteractionEntry struct {
|
||||
ID string `json:"id"`
|
||||
Kind string `json:"kind"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
Actor string `json:"actor,omitempty"`
|
||||
IssueID string `json:"issue_id,omitempty"`
|
||||
Model string `json:"model,omitempty"`
|
||||
Prompt string `json:"prompt,omitempty"`
|
||||
Response string `json:"response,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
ToolName string `json:"tool_name,omitempty"`
|
||||
ExitCode *int `json:"exit_code,omitempty"`
|
||||
ParentID string `json:"parent_id,omitempty"`
|
||||
Label string `json:"label,omitempty"`
|
||||
Reason string `json:"reason,omitempty"`
|
||||
Extra map[string]any `json:"extra,omitempty"`
|
||||
}
|
||||
|
||||
// BootstrapConfig controls bootstrap behavior
|
||||
type BootstrapConfig struct {
|
||||
BeadsDir string // Path to .beads directory
|
||||
DoltPath string // Path to dolt subdirectory
|
||||
LockTimeout time.Duration // Timeout waiting for bootstrap lock
|
||||
Database string // Database name (e.g. "beads_hq"); defaults to "beads"
|
||||
|
||||
// Routes to import during bootstrap (loaded by caller from routes.jsonl).
|
||||
// If nil, route import is skipped.
|
||||
Routes []BootstrapRoute
|
||||
}
|
||||
|
||||
// Bootstrap checks if Dolt DB needs bootstrapping from JSONL and performs it if needed.
|
||||
|
|
@ -259,9 +287,9 @@ func performBootstrap(ctx context.Context, cfg BootstrapConfig, jsonlPath string
|
|||
}
|
||||
|
||||
// Import routes first (no dependencies)
|
||||
routesImported, err := importRoutesBootstrap(ctx, store, cfg.BeadsDir)
|
||||
routesImported, err := importRoutesBootstrap(ctx, store, cfg.Routes)
|
||||
if err != nil {
|
||||
// Non-fatal - routes.jsonl may not exist
|
||||
// Non-fatal - routes may not exist
|
||||
fmt.Fprintf(os.Stderr, "Bootstrap: warning: failed to import routes: %v\n", err)
|
||||
}
|
||||
result.RoutesImported = routesImported
|
||||
|
|
@ -394,7 +422,8 @@ func truncateSnippet(s string) string {
|
|||
return s
|
||||
}
|
||||
|
||||
// detectPrefixFromIssues detects the most common prefix from issues
|
||||
// detectPrefixFromIssues detects the most common prefix from issues.
|
||||
// Uses a simple first-hyphen extraction to avoid importing internal/utils (cycle).
|
||||
func detectPrefixFromIssues(issues []*types.Issue) string {
|
||||
prefixCounts := make(map[string]int)
|
||||
|
||||
|
|
@ -402,9 +431,11 @@ func detectPrefixFromIssues(issues []*types.Issue) string {
|
|||
if issue.ID == "" {
|
||||
continue
|
||||
}
|
||||
prefix := utils.ExtractIssuePrefix(issue.ID)
|
||||
if prefix != "" {
|
||||
prefixCounts[prefix]++
|
||||
// Simple prefix extraction: take everything before the first hyphen.
|
||||
// For bootstrap purposes this is sufficient (e.g., "bd-abc" → "bd").
|
||||
idx := strings.Index(issue.ID, "-")
|
||||
if idx > 0 {
|
||||
prefixCounts[issue.ID[:idx]]++
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -528,13 +559,9 @@ func importIssuesBootstrap(ctx context.Context, store *DoltStore, issues []*type
|
|||
return imported, skipped, nil
|
||||
}
|
||||
|
||||
// importRoutesBootstrap imports routes from routes.jsonl during bootstrap
|
||||
// Returns the number of routes imported
|
||||
func importRoutesBootstrap(ctx context.Context, store *DoltStore, beadsDir string) (int, error) {
|
||||
routes, err := routing.LoadRoutes(beadsDir)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
// importRoutesBootstrap imports routes during bootstrap.
|
||||
// Routes are passed via BootstrapConfig to avoid importing internal/routing (cycle).
|
||||
func importRoutesBootstrap(ctx context.Context, store *DoltStore, routes []BootstrapRoute) (int, error) {
|
||||
if len(routes) == 0 {
|
||||
return 0, nil // No routes to import
|
||||
}
|
||||
|
|
@ -594,7 +621,7 @@ func importInteractionsBootstrap(ctx context.Context, store *DoltStore, interact
|
|||
continue
|
||||
}
|
||||
|
||||
var entry audit.Entry
|
||||
var entry bootstrapInteractionEntry
|
||||
if err := json.Unmarshal([]byte(line), &entry); err != nil {
|
||||
// Skip malformed lines during bootstrap
|
||||
continue
|
||||
|
|
|
|||
71
internal/storage/dolt/open.go
Normal file
71
internal/storage/dolt/open.go
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
//go:build cgo
|
||||
|
||||
package dolt
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/steveyegge/beads/internal/configfile"
|
||||
)
|
||||
|
||||
// NewFromConfig creates a DoltStore based on the metadata.json configuration.
|
||||
// beadsDir is the path to the .beads directory.
|
||||
func NewFromConfig(ctx context.Context, beadsDir string) (*DoltStore, error) {
|
||||
return NewFromConfigWithOptions(ctx, beadsDir, nil)
|
||||
}
|
||||
|
||||
// NewFromConfigWithOptions creates a DoltStore with options from metadata.json.
|
||||
// Options in cfg override those from the config file. Pass nil for default options.
|
||||
func NewFromConfigWithOptions(ctx context.Context, beadsDir string, cfg *Config) (*DoltStore, error) {
|
||||
fileCfg, err := configfile.Load(beadsDir)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("loading config: %w", err)
|
||||
}
|
||||
if fileCfg == nil {
|
||||
fileCfg = configfile.DefaultConfig()
|
||||
}
|
||||
|
||||
backend := fileCfg.GetBackend()
|
||||
switch backend {
|
||||
case configfile.BackendSQLite:
|
||||
return nil, fmt.Errorf("sqlite backend has been removed; run 'bd migrate --to-dolt' to migrate to Dolt")
|
||||
case configfile.BackendDolt, "":
|
||||
// Build config from metadata.json, allowing overrides from caller
|
||||
if cfg == nil {
|
||||
cfg = &Config{}
|
||||
}
|
||||
cfg.Path = fileCfg.DatabasePath(beadsDir)
|
||||
|
||||
// Merge Dolt server mode config (config provides defaults, caller can override)
|
||||
if fileCfg.IsDoltServerMode() {
|
||||
cfg.ServerMode = true
|
||||
if cfg.ServerHost == "" {
|
||||
cfg.ServerHost = fileCfg.GetDoltServerHost()
|
||||
}
|
||||
if cfg.ServerPort == 0 {
|
||||
cfg.ServerPort = fileCfg.GetDoltServerPort()
|
||||
}
|
||||
if cfg.ServerUser == "" {
|
||||
cfg.ServerUser = fileCfg.GetDoltServerUser()
|
||||
}
|
||||
if cfg.Database == "" {
|
||||
cfg.Database = fileCfg.GetDoltDatabase()
|
||||
}
|
||||
}
|
||||
|
||||
return New(ctx, cfg)
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown storage backend in config: %s", backend)
|
||||
}
|
||||
}
|
||||
|
||||
// GetBackendFromConfig returns the backend type from metadata.json.
|
||||
// Returns "dolt" if no config exists or backend is not specified.
|
||||
func GetBackendFromConfig(beadsDir string) string {
|
||||
cfg, err := configfile.Load(beadsDir)
|
||||
if err != nil || cfg == nil {
|
||||
return configfile.BackendDolt
|
||||
}
|
||||
return cfg.GetBackend()
|
||||
}
|
||||
|
|
@ -82,18 +82,3 @@ type Transaction interface {
|
|||
GetIssueComments(ctx context.Context, issueID string) ([]*types.Comment, error)
|
||||
}
|
||||
|
||||
// Config holds database configuration
|
||||
type Config struct {
|
||||
Backend string // "dolt" (only supported backend)
|
||||
|
||||
// Database file path (Dolt embedded)
|
||||
Path string
|
||||
|
||||
// Server mode config (Dolt server)
|
||||
Host string
|
||||
Port int
|
||||
Database string
|
||||
User string
|
||||
Password string
|
||||
SSLMode string
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import (
|
|||
"github.com/steveyegge/beads/internal/beads"
|
||||
"github.com/steveyegge/beads/internal/config"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/storage/factory"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -175,7 +174,7 @@ func getConfigFromDB(beadsDir string, key string) string {
|
|||
}
|
||||
|
||||
ctx := context.Background()
|
||||
store, err := factory.NewFromConfigWithOptions(ctx, beadsDir, factory.Options{ReadOnly: true})
|
||||
store, err := dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ func TestGetConfigFromDB(t *testing.T) {
|
|||
}
|
||||
|
||||
// setupTestBeadsDir creates a temporary .beads directory for testing.
|
||||
// Includes metadata.json with dolt backend so factory.NewFromConfigWithOptions
|
||||
// Includes metadata.json with dolt backend so dolt.NewFromConfigWithOptions
|
||||
// correctly opens the Dolt database created by the tests.
|
||||
func setupTestBeadsDir(t *testing.T) string {
|
||||
t.Helper()
|
||||
|
|
|
|||
|
|
@ -1,13 +1,27 @@
|
|||
//go:build cgo
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/steveyegge/beads/internal/storage/memory"
|
||||
"github.com/steveyegge/beads/internal/storage/dolt"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
)
|
||||
|
||||
func newTestStore(t *testing.T) *dolt.DoltStore {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
store, err := dolt.New(ctx, &dolt.Config{Path: filepath.Join(t.TempDir(), "test.db")})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create dolt store: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { store.Close() })
|
||||
return store
|
||||
}
|
||||
|
||||
func TestParseIssueID(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
|
@ -65,7 +79,7 @@ func TestParseIssueID(t *testing.T) {
|
|||
|
||||
func TestResolvePartialID(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
store := memory.New("")
|
||||
store := newTestStore(t)
|
||||
|
||||
// Create test issues with sequential IDs (current implementation)
|
||||
// When hash IDs (bd-165) are implemented, these can be hash-based
|
||||
|
|
@ -206,7 +220,7 @@ func TestResolvePartialID(t *testing.T) {
|
|||
|
||||
func TestResolvePartialIDs(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
store := memory.New("")
|
||||
store := newTestStore(t)
|
||||
|
||||
// Create test issues
|
||||
issue1 := &types.Issue{
|
||||
|
|
@ -290,7 +304,7 @@ func TestResolvePartialIDs(t *testing.T) {
|
|||
|
||||
func TestResolvePartialID_NoConfig(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
store := memory.New("")
|
||||
store := newTestStore(t)
|
||||
|
||||
// Create test issue without setting config (test default prefix)
|
||||
issue1 := &types.Issue{
|
||||
|
|
@ -559,7 +573,7 @@ func findSubstring(s, substr string) bool {
|
|||
// a single database.
|
||||
func TestResolvePartialID_CrossPrefix(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
store := memory.New("")
|
||||
store := newTestStore(t)
|
||||
|
||||
// Create issues with different prefixes (simulating multi-repo hydration)
|
||||
hqIssue := &types.Issue{
|
||||
|
|
@ -658,7 +672,7 @@ func TestResolvePartialID_CrossPrefix(t *testing.T) {
|
|||
// the search query (matching title/description/ID) instead of loading all issues.
|
||||
func TestResolvePartialID_TitleFalsePositive(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
store := memory.New("")
|
||||
store := newTestStore(t)
|
||||
|
||||
// Issue whose title contains "abc12" but ID does NOT
|
||||
decoy := &types.Issue{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue