From 797a44bf048f27e5db5c79dcbf7e406969ca6904 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 24 Aug 2019 16:18:01 -0500 Subject: [PATCH] Rename BuildFrontendFunc to BuildFrontend For consistency with other functions supplied in Config. --- config.go | 20 ++++++++++---------- pgconn.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config.go b/config.go index a861ff5f..b5c119f5 100644 --- a/config.go +++ b/config.go @@ -29,15 +29,15 @@ type ValidateConnectFunc func(ctx context.Context, pgconn *PgConn) error // Config is the settings used to establish a connection to a PostgreSQL server. It must be created by ParseConfig and // then it can be modified. A manually initialized Config will cause ConnectConfig to panic. type Config struct { - Host string // host (e.g. localhost) or path to unix domain socket directory (e.g. /private/tmp) - Port uint16 - Database string - User string - Password string - TLSConfig *tls.Config // nil disables TLS - DialFunc DialFunc // e.g. net.Dialer.DialContext - BuildFrontendFunc BuildFrontendFunc - RuntimeParams map[string]string // Run-time parameters to set on connection as session default values (e.g. search_path or application_name) + Host string // host (e.g. localhost) or path to unix domain socket directory (e.g. /private/tmp) + Port uint16 + Database string + User string + Password string + TLSConfig *tls.Config // nil disables TLS + DialFunc DialFunc // e.g. net.Dialer.DialContext + BuildFrontend BuildFrontendFunc + RuntimeParams map[string]string // Run-time parameters to set on connection as session default values (e.g. search_path or application_name) Fallbacks []*FallbackConfig @@ -165,7 +165,7 @@ func ParseConfig(connString string) (*Config, error) { User: settings["user"], Password: settings["password"], RuntimeParams: make(map[string]string), - BuildFrontendFunc: makeDefaultBuildFrontendFunc(), + BuildFrontend: makeDefaultBuildFrontendFunc(), } if connectTimeout, present := settings["connect_timeout"]; present { diff --git a/pgconn.go b/pgconn.go index b0e4cfd2..fe2f304e 100644 --- a/pgconn.go +++ b/pgconn.go @@ -174,7 +174,7 @@ func connect(ctx context.Context, config *Config, fallbackConfig *FallbackConfig func() { pgConn.conn.SetDeadline(time.Time{}) }, ) - pgConn.frontend = config.BuildFrontendFunc(pgConn.conn) + pgConn.frontend = config.BuildFrontend(pgConn.conn) startupMsg := pgproto3.StartupMessage{ ProtocolVersion: pgproto3.ProtocolVersionNumber,