Apply ConnectAttributes for postgres (cadence-workflow#4639)

common/persistence/sql/sqlplugin/postgres/plugin.go

@@ -79,17 +79,19 @@ func (d *plugin) CreateAdminDB(cfg *config.SQL) (sqlplugin.AdminDB, error) {
 // SQL database and the object can be used to perform CRUD operations on
 // the tables in the database
 func (d *plugin) createSingleDBConn(cfg *config.SQL) (*sqlx.DB, error) {
-	sslParams, err := registerTLSConfig(cfg)
+	params, err := registerTLSConfig(cfg)
 	if err != nil {
 		return nil, err
 	}
-
+	for k, v := range cfg.ConnectAttributes {
+		params.Set(k, v)
+	}
 	host, port, err := net.SplitHostPort(cfg.ConnectAddr)
 	if err != nil {
 		return nil, fmt.Errorf("invalid connect address, it must be in host:port format, %v, err: %v", cfg.ConnectAddr, err)
 	}
 
-	db, err := sqlx.Connect(PluginName, buildDSN(cfg, host, port, sslParams))
+	db, err := sqlx.Connect(PluginName, buildDSN(cfg, host, port, params))
 	if err != nil {
 		return nil, err
 	}
@@ -108,7 +110,7 @@ func (d *plugin) createSingleDBConn(cfg *config.SQL) (*sqlx.DB, error) {
 	return db, nil
 }
 
-func buildDSN(cfg *config.SQL, host string, port string, sslParams url.Values) string {
+func buildDSN(cfg *config.SQL, host string, port string, params url.Values) string {
 	dbName := cfg.DatabaseName
 	//NOTE: postgres doesn't allow to connect with empty dbName, the admin dbName is "postgres"
 	if dbName == "" {
@@ -117,7 +119,7 @@ func buildDSN(cfg *config.SQL, host string, port string, sslParams url.Values) s
 
 	credentialString := generateCredentialString(cfg.User, cfg.Password)
 	dsn := fmt.Sprintf(dsnFmt, credentialString, host, port, dbName)
-	if attrs := sslParams.Encode(); attrs != "" {
+	if attrs := params.Encode(); attrs != "" {
 		dsn += "?" + attrs
 	}
 	return dsn