remove confusion caused by unnecessary logic ported from old mysql setup

tinode · May 6, 2023 · b7817c7 · b7817c7
1 parent 52f33fe
commit b7817c7
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/server/db/postgres/adapter.go b/server/db/postgres/adapter.go
@@ -69,8 +69,7 @@ type configType struct {
 	Port   string `json:"port,omitempty"`
 	DBName string `json:"dbname,omitempty"`
 	// Deprecated.
-	DSN      string `json:"dsn,omitempty"`
-	Database string `json:"database,omitempty"`
+	DSN string `json:"dsn,omitempty"`
 
 	// Connection pool settings.
 	//
@@ -119,16 +118,15 @@ func (a *adapter) Open(jsonconfig json.RawMessage) error {
 
 	if config.DSN != "" {
 		a.dsn = config.DSN
-		a.dbName = config.Database
 	} else {
-		dsn, err := setConnStr(config)
+		a.dsn, err = setConnStr(config)
 		if err != nil {
 			return err
 		}
-		a.dsn = dsn
-		a.dbName = config.DBName
 	}
 
+	a.dbName = config.DBName
+
 	if a.dsn == "" {
 		a.dsn = defaultDSN
 	}