diff --git a/cmd/bd/init.go b/cmd/bd/init.go index 66e2de491..e1d5afede 100644 --- a/cmd/bd/init.go +++ b/cmd/bd/init.go @@ -345,7 +345,12 @@ variable.`, if backend == configfile.BackendDolt { // Dolt uses a directory, not a file storagePath = filepath.Join(beadsDir, "dolt") - store, err = factory.New(ctx, backend, storagePath) + // Use prefix-based database name to avoid cross-rig contamination (bd-u8rda) + dbName := "beads" + if prefix != "" { + dbName = "beads_" + prefix + } + store, err = factory.NewWithOptions(ctx, backend, storagePath, factory.Options{Database: dbName}) } else { storagePath = initDBPath store, err = sqlite.New(ctx, storagePath) @@ -443,6 +448,12 @@ variable.`, cfg.Database = "dolt" } + // Set prefix-based SQL database name to avoid cross-rig contamination (bd-u8rda). + // E.g., prefix "gt" → database "beads_gt", prefix "bd" → database "beads_bd". + if prefix != "" { + cfg.DoltDatabase = "beads_" + prefix + } + // Save server mode configuration (bd-dolt.2.2) if serverMode { cfg.DoltMode = configfile.DoltModeServer diff --git a/cmd/bd/migrate_dolt.go b/cmd/bd/migrate_dolt.go index 7ddfdb59b..26bac6cf9 100644 --- a/cmd/bd/migrate_dolt.go +++ b/cmd/bd/migrate_dolt.go @@ -110,7 +110,13 @@ func handleToDoltMigration(dryRun bool, autoYes bool) { // Create Dolt database printProgress("Creating Dolt database...") - doltStore, err := dolt.New(ctx, &dolt.Config{Path: doltPath}) + // Use prefix-based database name to avoid cross-rig contamination (bd-u8rda). + // E.g., prefix "gt" → database "beads_gt", prefix "bd" → database "beads_bd". + dbName := "beads" + if data.prefix != "" { + dbName = "beads_" + data.prefix + } + doltStore, err := dolt.New(ctx, &dolt.Config{Path: doltPath, Database: dbName}) if err != nil { exitWithError("dolt_create_failed", err.Error(), "") } @@ -137,6 +143,7 @@ func handleToDoltMigration(dryRun bool, autoYes bool) { // Update metadata.json cfg.Backend = configfile.BackendDolt cfg.Database = "dolt" + cfg.DoltDatabase = dbName cfg.DoltServerPort = configfile.DefaultDoltServerPort if err := cfg.Save(beadsDir); err != nil { exitWithError("config_save_failed", err.Error(), diff --git a/internal/storage/dolt/store.go b/internal/storage/dolt/store.go index 55524dfc8..df8f37bf6 100644 --- a/internal/storage/dolt/store.go +++ b/internal/storage/dolt/store.go @@ -243,7 +243,7 @@ func openServerConnection(ctx context.Context, cfg *Config) (*sql.DB, string, er } defer func() { _ = initDB.Close() }() - _, err = initDB.ExecContext(ctx, fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", cfg.Database)) + _, err = initDB.ExecContext(ctx, fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s`", cfg.Database)) if err != nil { // Dolt may return error 1007 even with IF NOT EXISTS - ignore if database already exists errLower := strings.ToLower(err.Error())