GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch from ExecParams to Exec in ValidateConnectTargetSessionAttrs functions

pull/2169/head
Alexander Rumyantsev 2024-11-19 19:42:49 +03:00
parent b9e2b20fb1
commit 4b7e9942b2
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pgconn/config.go
View File

@ -861,12 +861,12 @@ func makeConnectTimeoutDialFunc(timeout time.Duration) DialFunc {
// ValidateConnectTargetSessionAttrsReadWrite is a ValidateConnectFunc that implements libpq compatible // ValidateConnectTargetSessionAttrsReadWrite is a ValidateConnectFunc that implements libpq compatible
// target_session_attrs=read-write. // target_session_attrs=read-write.
func ValidateConnectTargetSessionAttrsReadWrite(ctx context.Context, pgConn *PgConn) error { func ValidateConnectTargetSessionAttrsReadWrite(ctx context.Context, pgConn *PgConn) error {
result := pgConn.ExecParams(ctx, "show transaction_read_only", nil, nil, nil, nil).Read() result, err := pgConn.Exec(ctx, "show transaction_read_only").ReadAll()
if result.Err != nil { if err != nil {
return result.Err return err
} }
if string(result.Rows[0][0]) == "on" { if string(result[0].Rows[0][0]) == "on" {
return errors.New("read only connection") return errors.New("read only connection")
} }
@ -876,12 +876,12 @@ func ValidateConnectTargetSessionAttrsReadWrite(ctx context.Context, pgConn *PgC
// ValidateConnectTargetSessionAttrsReadOnly is a ValidateConnectFunc that implements libpq compatible // ValidateConnectTargetSessionAttrsReadOnly is a ValidateConnectFunc that implements libpq compatible
// target_session_attrs=read-only. // target_session_attrs=read-only.
func ValidateConnectTargetSessionAttrsReadOnly(ctx context.Context, pgConn *PgConn) error { func ValidateConnectTargetSessionAttrsReadOnly(ctx context.Context, pgConn *PgConn) error {
result := pgConn.ExecParams(ctx, "show transaction_read_only", nil, nil, nil, nil).Read() result, err := pgConn.Exec(ctx, "show transaction_read_only").ReadAll()
if result.Err != nil { if err != nil {
return result.Err return err
} }
if string(result.Rows[0][0]) != "on" { if string(result[0].Rows[0][0]) != "on" {
return errors.New("connection is not read only") return errors.New("connection is not read only")
} }
@ -891,12 +891,12 @@ func ValidateConnectTargetSessionAttrsReadOnly(ctx context.Context, pgConn *PgCo
// ValidateConnectTargetSessionAttrsStandby is a ValidateConnectFunc that implements libpq compatible // ValidateConnectTargetSessionAttrsStandby is a ValidateConnectFunc that implements libpq compatible
// target_session_attrs=standby. // target_session_attrs=standby.
func ValidateConnectTargetSessionAttrsStandby(ctx context.Context, pgConn *PgConn) error { func ValidateConnectTargetSessionAttrsStandby(ctx context.Context, pgConn *PgConn) error {
result := pgConn.ExecParams(ctx, "select pg_is_in_recovery()", nil, nil, nil, nil).Read() result, err := pgConn.Exec(ctx, "select pg_is_in_recovery()").ReadAll()
if result.Err != nil { if err != nil {
return result.Err return err
} }
if string(result.Rows[0][0]) != "t" { if string(result[0].Rows[0][0]) != "t" {
return errors.New("server is not in hot standby mode") return errors.New("server is not in hot standby mode")
} }
@ -906,12 +906,12 @@ func ValidateConnectTargetSessionAttrsStandby(ctx context.Context, pgConn *PgCon
// ValidateConnectTargetSessionAttrsPrimary is a ValidateConnectFunc that implements libpq compatible // ValidateConnectTargetSessionAttrsPrimary is a ValidateConnectFunc that implements libpq compatible
// target_session_attrs=primary. // target_session_attrs=primary.
func ValidateConnectTargetSessionAttrsPrimary(ctx context.Context, pgConn *PgConn) error { func ValidateConnectTargetSessionAttrsPrimary(ctx context.Context, pgConn *PgConn) error {
result := pgConn.ExecParams(ctx, "select pg_is_in_recovery()", nil, nil, nil, nil).Read() result, err := pgConn.Exec(ctx, "select pg_is_in_recovery()").ReadAll()
if result.Err != nil { if err != nil {
return result.Err return err
} }
if string(result.Rows[0][0]) == "t" { if string(result[0].Rows[0][0]) == "t" {
return errors.New("server is in standby mode") return errors.New("server is in standby mode")
} }
@ -921,12 +921,12 @@ func ValidateConnectTargetSessionAttrsPrimary(ctx context.Context, pgConn *PgCon
// ValidateConnectTargetSessionAttrsPreferStandby is a ValidateConnectFunc that implements libpq compatible // ValidateConnectTargetSessionAttrsPreferStandby is a ValidateConnectFunc that implements libpq compatible
// target_session_attrs=prefer-standby. // target_session_attrs=prefer-standby.
func ValidateConnectTargetSessionAttrsPreferStandby(ctx context.Context, pgConn *PgConn) error { func ValidateConnectTargetSessionAttrsPreferStandby(ctx context.Context, pgConn *PgConn) error {
result := pgConn.ExecParams(ctx, "select pg_is_in_recovery()", nil, nil, nil, nil).Read() result, err := pgConn.Exec(ctx, "select pg_is_in_recovery()").ReadAll()
if result.Err != nil { if err != nil {
return result.Err return err
} }
if string(result.Rows[0][0]) != "t" { if string(result[0].Rows[0][0]) != "t" {
return &NotPreferredError{err: errors.New("server is not in hot standby mode")} return &NotPreferredError{err: errors.New("server is not in hot standby mode")}
} }