Skip to content

Changed configuration file for function passing #2125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hydrocharged merged 1 commit into from
Dec 16, 2025
Merged

Changed configuration file for function passing #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/doltgres/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
}
Expand Down
3 changes: 2 additions & 1 deletion server/initialization/initialization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand All @@ -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()
Expand Down
Loading