Implementing new methods from servercfg.DoltgresConfig

dolthub · Jan 13, 2025 · 0de6241 · 0de6241
1 parent 7f91aea
commit 0de6241
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/server.go b/server/server.go
@@ -156,7 +156,7 @@ func runServer(ctx context.Context, cfg *servercfg.DoltgresConfig, dEnv *env.Dol
 		}
 	}()
 
-	sqlserver.ConfigureServices(ssCfg, controller, Version, dEnv)
+	sqlserver.ConfigureServices(ssCfg, controller, Version, dEnv, false)
 	go controller.Start(newCtx)
 
 	err = controller.WaitForStart()

diff --git a/servercfg/config.go b/servercfg/config.go
@@ -169,6 +169,8 @@ type DoltgresConfig struct {
 	PostgresReplicationConfig *PostgresReplicationConfig `yaml:"postgres_replication,omitempty" minver:"0.7.4"`
 }
 
+var _ servercfg.ServerConfig = (*DoltgresConfig)(nil)
+
 // Ptr is a helper function that returns a pointer to the value passed in. This is necessary to e.g. get a pointer to
 // a const value without assigning to an intermediate variable.
 func Ptr[T any](v T) *T {
@@ -227,6 +229,10 @@ func (cfg *DoltgresConfig) User() string {
 	return *cfg.UserConfig.Name
 }
 
+func (cfg *DoltgresConfig) UserIsSpecified() bool {
+	return cfg.UserConfig != nil && cfg.UserConfig.Name != nil
+}
+
 func (cfg *DoltgresConfig) Password() string {
 	if cfg.UserConfig == nil || cfg.UserConfig.Password == nil {
 		return "password"