Skip to content

Commit de806a1

Browse files
committed
fix: return pgconn.ParseConfigError inside ParseConfig functions
1 parent ce13266 commit de806a1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

conn.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con
172172
delete(config.RuntimeParams, "statement_cache_capacity")
173173
n, err := strconv.ParseInt(s, 10, 32)
174174
if err != nil {
175-
return nil, fmt.Errorf("cannot parse statement_cache_capacity: %w", err)
175+
return nil, pgconn.NewParseConfigError(connString, "cannot parse statement_cache_capacity", err)
176176
}
177177
statementCacheCapacity = int(n)
178178
}
@@ -182,7 +182,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con
182182
delete(config.RuntimeParams, "description_cache_capacity")
183183
n, err := strconv.ParseInt(s, 10, 32)
184184
if err != nil {
185-
return nil, fmt.Errorf("cannot parse description_cache_capacity: %w", err)
185+
return nil, pgconn.NewParseConfigError(connString, "cannot parse description_cache_capacity", err)
186186
}
187187
descriptionCacheCapacity = int(n)
188188
}
@@ -202,7 +202,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con
202202
case "simple_protocol":
203203
defaultQueryExecMode = QueryExecModeSimpleProtocol
204204
default:
205-
return nil, fmt.Errorf("invalid default_query_exec_mode: %s", s)
205+
return nil, pgconn.NewParseConfigError(connString, "invalid default_query_exec_mode", err)
206206
}
207207
}
208208

pgxpool/pool.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,10 @@ func ParseConfig(connString string) (*Config, error) {
321321
delete(connConfig.Config.RuntimeParams, "pool_max_conns")
322322
n, err := strconv.ParseInt(s, 10, 32)
323323
if err != nil {
324-
return nil, fmt.Errorf("cannot parse pool_max_conns: %w", err)
324+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_max_conns", err)
325325
}
326326
if n < 1 {
327-
return nil, fmt.Errorf("pool_max_conns too small: %d", n)
327+
return nil, pgconn.NewParseConfigError(connString, "pool_max_conns too small", err)
328328
}
329329
config.MaxConns = int32(n)
330330
} else {
@@ -338,7 +338,7 @@ func ParseConfig(connString string) (*Config, error) {
338338
delete(connConfig.Config.RuntimeParams, "pool_min_conns")
339339
n, err := strconv.ParseInt(s, 10, 32)
340340
if err != nil {
341-
return nil, fmt.Errorf("cannot parse pool_min_conns: %w", err)
341+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_min_conns", err)
342342
}
343343
config.MinConns = int32(n)
344344
} else {
@@ -349,7 +349,7 @@ func ParseConfig(connString string) (*Config, error) {
349349
delete(connConfig.Config.RuntimeParams, "pool_min_idle_conns")
350350
n, err := strconv.ParseInt(s, 10, 32)
351351
if err != nil {
352-
return nil, fmt.Errorf("cannot parse pool_min_idle_conns: %w", err)
352+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_min_idle_conns", err)
353353
}
354354
config.MinIdleConns = int32(n)
355355
} else {
@@ -360,7 +360,7 @@ func ParseConfig(connString string) (*Config, error) {
360360
delete(connConfig.Config.RuntimeParams, "pool_max_conn_lifetime")
361361
d, err := time.ParseDuration(s)
362362
if err != nil {
363-
return nil, fmt.Errorf("invalid pool_max_conn_lifetime: %w", err)
363+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_max_conn_lifetime", err)
364364
}
365365
config.MaxConnLifetime = d
366366
} else {
@@ -371,7 +371,7 @@ func ParseConfig(connString string) (*Config, error) {
371371
delete(connConfig.Config.RuntimeParams, "pool_max_conn_idle_time")
372372
d, err := time.ParseDuration(s)
373373
if err != nil {
374-
return nil, fmt.Errorf("invalid pool_max_conn_idle_time: %w", err)
374+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_max_conn_idle_time", err)
375375
}
376376
config.MaxConnIdleTime = d
377377
} else {
@@ -382,7 +382,7 @@ func ParseConfig(connString string) (*Config, error) {
382382
delete(connConfig.Config.RuntimeParams, "pool_health_check_period")
383383
d, err := time.ParseDuration(s)
384384
if err != nil {
385-
return nil, fmt.Errorf("invalid pool_health_check_period: %w", err)
385+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_health_check_period", err)
386386
}
387387
config.HealthCheckPeriod = d
388388
} else {
@@ -393,7 +393,7 @@ func ParseConfig(connString string) (*Config, error) {
393393
delete(connConfig.Config.RuntimeParams, "pool_max_conn_lifetime_jitter")
394394
d, err := time.ParseDuration(s)
395395
if err != nil {
396-
return nil, fmt.Errorf("invalid pool_max_conn_lifetime_jitter: %w", err)
396+
return nil, pgconn.NewParseConfigError(connString, "cannot parse pool_max_conn_lifetime_jitter", err)
397397
}
398398
config.MaxConnLifetimeJitter = d
399399
}

0 commit comments

Comments
 (0)