Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion flow/cmd/check_pinned_versions/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
var pinnedVersions = map[string]string{
"github.com/aws/aws-sdk-go-v2/feature/s3/manager": "v1.21.0",
"github.com/tikv/pd/client": "v0.0.0-20251229071808-6173d50c004c",
"github.com/jackc/pgx/v5": "v5.9.1",
}

func main() {
Expand Down
7 changes: 7 additions & 0 deletions flow/connectors/postgres/postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ func ParseConfig(connectionString string, pgConfig *protos.PostgresConfig) (*pgx
return nil, fmt.Errorf("failed to parse connection string: %w", err)
}

// Explicitly set the max protocol version. This removes the risk of inadvertedly
// changing the protocol, for example, through a dependency update.
// The version currently set is the default defined but the previsously pinned
// PG client library jackc/pgx/v5 v5.9.1 -> 3.0
// Reference: https://github.com/jackc/pgx/blob/4e4eaedb47b7b3cfba0a1b0a9e6a3f015764f046/pgconn/config.go#L472-L474
connConfig.Config.MaxProtocolVersion = "3.0"

shouldUseTls := internal.PGMustUseTlsConnection(pgConfig)

if shouldUseTls || pgConfig.RootCa != nil {
Expand Down
3 changes: 3 additions & 0 deletions flow/connectors/postgres/qvalue_convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ func (c *PostgresConnector) convertToString(oid uint32, value any) string {
if value == nil {
return ""
}
if hwAddr, ok := value.(net.HardwareAddr); ok {
return hwAddr.String()
}
if buf, err := c.typeMap.Encode(oid, pgtype.TextFormatCode, value, nil); err == nil {
return shared.UnsafeFastReadOnlyBytesToString(buf)
}
Expand Down
3 changes: 1 addition & 2 deletions flow/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
github.com/hamba/avro/v2 v2.31.0
github.com/jackc/pgerrcode v0.0.0-20250907135507-afb5586c32a6
github.com/jackc/pglogrepl v0.0.0-20260401131349-e37c41485510
github.com/jackc/pgx/v5 v5.9.1 // PINNED: v5.9.2 enables Postgres wire protocol v3.2 by default which changes macaddr[] decoding
github.com/jackc/pgx/v5 v5.10.0
github.com/joho/godotenv v1.5.1
github.com/json-iterator/go v1.1.12
github.com/lestrrat-go/httprc/v3 v3.0.5
Expand Down Expand Up @@ -333,5 +333,4 @@ exclude (
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.15
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.16
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.17
github.com/jackc/pgx/v5 v5.9.2
)
6 changes: 2 additions & 4 deletions flow/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-mysql-org/go-mysql v1.15.0 h1:bZeRUc9yNVbFEyote79Q4j8SV+q8Ls32AYXRl2QjUoc=
github.com/go-mysql-org/go-mysql v1.15.0/go.mod h1:VjBTZTTDKL8OMXUAhNbg3VHaVVq9HOXJEBLpAKBFIfE=
github.com/go-mysql-org/go-mysql v1.15.1-0.20260615132323-06b4fb6b476d h1:Kl+pOPwscRCgRjhN76nQkJEiXk49q10BxwHCdSrzyOE=
github.com/go-mysql-org/go-mysql v1.15.1-0.20260615132323-06b4fb6b476d/go.mod h1:VjBTZTTDKL8OMXUAhNbg3VHaVVq9HOXJEBLpAKBFIfE=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
Expand Down Expand Up @@ -433,8 +431,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
Expand Down
2 changes: 1 addition & 1 deletion flow/pkg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.101.0
github.com/go-mysql-org/go-mysql v1.15.0
github.com/google/uuid v1.6.0
github.com/jackc/pgx/v5 v5.9.1
github.com/jackc/pgx/v5 v5.10.0
github.com/stretchr/testify v1.11.1
go.mongodb.org/mongo-driver/v2 v2.6.0
go.temporal.io/sdk v1.44.0
Expand Down
4 changes: 2 additions & 2 deletions flow/pkg/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down
5 changes: 0 additions & 5 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@
"matchPackageNames": ["github.com/tikv/pd/client"],
"allowedVersions": "v0.0.0-20251229071808-6173d50c004c"
},
{
"matchManagers": ["gomod"],
"matchPackageNames": ["github.com/jackc/pgx/v5"],
"allowedVersions": "v5.9.1"
},
// This package rule instruct renovate to require approval from
// the dependency dashboard before proposing major upgrades.
// This sets a default is approval mindset for automatic proposals.
Expand Down
Loading