Merge remote-tracking branch 'origin/main' into reltuk-29a5ed0f

reltuk · reltuk · commit 7b8fefee4ee9 · 2026-04-14T11:29:00.000-07:00
diff --git a/server/server.go b/server/server.go
@@ -139,7 +139,7 @@ func runServer(ctx context.Context, cfg *servercfg.DoltgresConfig, dEnv *env.Dol
 
 	// Determine whether we need to initialize the default database
 	initializeDefaultDatabase := true
-	mrEnv, err := env.MultiEnvForDirectory(ctx, dEnv.Config.WriteableConfig(), dataDirFs, Version, dEnv)
+	mrEnv, err := env.MultiEnvForDirectory(ctx, dataDirFs, dEnv)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func runServer(ctx context.Context, cfg servercfg.DoltgresConfig, dEnv env.Dol`
`139`	`139`
`140`	`140`	`// Determine whether we need to initialize the default database`
`141`	`141`	`initializeDefaultDatabase := true`
`142`		`- mrEnv, err := env.MultiEnvForDirectory(ctx, dEnv.Config.WriteableConfig(), dataDirFs, Version, dEnv)`
	`142`	`+ mrEnv, err := env.MultiEnvForDirectory(ctx, dataDirFs, dEnv)`
`143`	`143`	`if err != nil {`
`144`	`144`	`return nil, err`
`145`	`145`	`}`