Merge branch 'master' into psql

jackc · Mar 25, 2023 · 0b9a474 · 0b9a474
2 parents 9ca7c41 + 334e025
commit 0b9a474
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -924,7 +924,10 @@ func findMigrationsForRenumber(path string) ([]string, error) {
 }
 
 func LoadConfig() (*Config, error) {
-	config := &Config{VersionTable: "public.schema_version"}
+	config := &Config{
+		VersionTable: "public.schema_version",
+		Data:         make(map[string]interface{}),
+	}
 	if connConfig, err := pgx.ParseConfig(""); err == nil {
 		config.ConnConfig = *connConfig
 	} else {
@@ -1054,7 +1057,6 @@ func appendConfigFromFile(config *Config, path string) error {
 		config.SslRootCert = sslrootcert
 	}
 
-	config.Data = make(map[string]interface{})
 	for key, value := range file["data"] {
 		config.Data[key] = value
 	}