From 3497f0e8f93a10c2e890e97e9fdead10773d2455 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 12 Apr 2019 16:56:54 -0500 Subject: [PATCH] Expose ParseConfig --- conn.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/conn.go b/conn.go index 06a3f266..00f3eb2d 100644 --- a/conn.go +++ b/conn.go @@ -139,6 +139,19 @@ func (e ProtocolError) Error() string { // Connect establishes a connection with a PostgreSQL server with a connection string. See // pgconn.Connect for details. func Connect(ctx context.Context, connString string) (*Conn, error) { + connConfig, err := ParseConfig(connString) + if err != nil { + return nil, err + } + return connect(ctx, connConfig, minimalConnInfo) +} + +// Connect establishes a connection with a PostgreSQL server with a configuration struct. +func ConnectConfig(ctx context.Context, connConfig *ConnConfig) (*Conn, error) { + return connect(ctx, connConfig, minimalConnInfo) +} + +func ParseConfig(connString string) (*ConnConfig, error) { config, err := pgconn.ParseConfig(connString) if err != nil { return nil, err @@ -147,12 +160,7 @@ func Connect(ctx context.Context, connString string) (*Conn, error) { Config: *config, } - return connect(ctx, connConfig, minimalConnInfo) -} - -// Connect establishes a connection with a PostgreSQL server with a configuration struct. -func ConnectConfig(ctx context.Context, connConfig *ConnConfig) (*Conn, error) { - return connect(ctx, connConfig, minimalConnInfo) + return connConfig, nil } func connect(ctx context.Context, config *ConnConfig, connInfo *pgtype.ConnInfo) (c *Conn, err error) {