Skip to content

Commit a8989d7

Browse files
committed
Changed configuration file for function passing
1 parent d2b62e0 commit a8989d7

12 files changed

Lines changed: 724 additions & 640 deletions

File tree

cmd/doltgres/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141

4242
"github.com/dolthub/doltgresql/server"
4343
"github.com/dolthub/doltgresql/servercfg"
44+
"github.com/dolthub/doltgresql/servercfg/cfgdetails"
4445
"github.com/dolthub/doltgresql/utils"
4546
)
4647

@@ -320,15 +321,15 @@ func getDataDirFromParams(params map[string]*string) (string, dataDirType, error
320321
return dataDir, dataDirExplicitParam, nil
321322
}
322323

323-
if envDir := os.Getenv(servercfg.DOLTGRES_DATA_DIR); len(envDir) > 0 {
324+
if envDir := os.Getenv(cfgdetails.DOLTGRES_DATA_DIR); len(envDir) > 0 {
324325
return envDir, dataDirEnv, nil
325326
} else {
326327
homeDir, err := env.GetCurrentUserHomeDir()
327328
if err != nil {
328329
return "", dataDirDefault, errors.Errorf("failed to get current user's home directory: %w", err)
329330
}
330331

331-
dbDir := filepath.Join(homeDir, servercfg.DOLTGRES_DATA_DIR_DEFAULT)
332+
dbDir := filepath.Join(homeDir, cfgdetails.DOLTGRES_DATA_DIR_DEFAULT)
332333
return dbDir, dataDirDefault, nil
333334
}
334335
}

server/initialization/initialization.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"github.com/dolthub/doltgresql/server/tables/information_schema"
3737
"github.com/dolthub/doltgresql/server/tables/pgcatalog"
3838
doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
39+
"github.com/dolthub/doltgresql/servercfg/cfgdetails"
3940
)
4041

4142
var once = &sync.Once{}
@@ -54,7 +55,7 @@ func Initialize(dEnv *env.DoltEnv, cfg *doltgresservercfg.DoltgresConfig) {
5455
aggregate.Init()
5556
cast.Init()
5657
framework.Initialize()
57-
servercfg.DefaultUnixSocketFilePath = doltgresservercfg.DefaultPostgresUnixSocketFilePath
58+
servercfg.DefaultUnixSocketFilePath = cfgdetails.DefaultPostgresUnixSocketFilePath
5859
tables.Init()
5960
pgcatalog.Init()
6061
information_schema.Init()

0 commit comments

Comments
 (0)