Merge branch 'main' into zachmu/index-logic

Author: zachmu

cmd/doltgres/main.go

@@ -41,6 +41,7 @@ import (
 
 	"github.com/dolthub/doltgresql/server"
 	"github.com/dolthub/doltgresql/servercfg"
+	"github.com/dolthub/doltgresql/servercfg/cfgdetails"
 	"github.com/dolthub/doltgresql/utils"
 )
 
@@ -320,15 +321,15 @@ func getDataDirFromParams(params map[string]*string) (string, dataDirType, error
 		return dataDir, dataDirExplicitParam, nil
 	}
 
-	if envDir := os.Getenv(servercfg.DOLTGRES_DATA_DIR); len(envDir) > 0 {
+	if envDir := os.Getenv(cfgdetails.DOLTGRES_DATA_DIR); len(envDir) > 0 {
 		return envDir, dataDirEnv, nil
 	} else {
 		homeDir, err := env.GetCurrentUserHomeDir()
 		if err != nil {
 			return "", dataDirDefault, errors.Errorf("failed to get current user's home directory: %w", err)
 		}
 
-		dbDir := filepath.Join(homeDir, servercfg.DOLTGRES_DATA_DIR_DEFAULT)
+		dbDir := filepath.Join(homeDir, cfgdetails.DOLTGRES_DATA_DIR_DEFAULT)
 		return dbDir, dataDirDefault, nil
 	}
 }

server/initialization/initialization.go

@@ -36,6 +36,7 @@ import (
 	"github.com/dolthub/doltgresql/server/tables/information_schema"
 	"github.com/dolthub/doltgresql/server/tables/pgcatalog"
 	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
+	"github.com/dolthub/doltgresql/servercfg/cfgdetails"
 )
 
 var once = &sync.Once{}
@@ -54,7 +55,7 @@ func Initialize(dEnv *env.DoltEnv, cfg *doltgresservercfg.DoltgresConfig) {
 		aggregate.Init()
 		cast.Init()
 		framework.Initialize()
-		servercfg.DefaultUnixSocketFilePath = doltgresservercfg.DefaultPostgresUnixSocketFilePath
+		servercfg.DefaultUnixSocketFilePath = cfgdetails.DefaultPostgresUnixSocketFilePath
 		tables.Init()
 		pgcatalog.Init()
 		information_schema.Init()