From b329eb7426d47561c30d5faba8bdf0b0bf9838ae Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Sun, 19 Oct 2025 00:30:48 +0200 Subject: [PATCH v1 1/3] Bump protocol version to 3.3 This commit increments the PostgreSQL frontend/backend protocol version from 3.2 to 3.3 and does the required boilerplate changes. The next commit will introduce an actual protocol change. --- doc/src/sgml/protocol.sgml | 4 ++-- src/include/libpq/pqcomm.h | 2 +- src/interfaces/libpq/fe-connect.c | 12 ++++++++++ .../modules/libpq_pipeline/libpq_pipeline.c | 22 ++++++++++++++++--- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 9d755232873..8234079deba 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -18,8 +18,8 @@ - This document describes version 3.2 of the protocol, introduced in - PostgreSQL version 18. The server and the libpq + This document describes version 3.3 of the protocol, introduced in + PostgreSQL version 19. The server and the libpq client library are backwards compatible with protocol version 3.0, implemented in PostgreSQL 7.4 and later. diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index f04ca135653..2423394b348 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -94,7 +94,7 @@ is_unixsock_path(const char *path) */ #define PG_PROTOCOL_EARLIEST PG_PROTOCOL(3,0) -#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,2) +#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,3) typedef uint32 ProtocolVersion; /* FE/BE protocol version number */ diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index a3d12931fff..76f9ce3a23e 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8301,6 +8301,18 @@ pqParseProtocolVersion(const char *value, ProtocolVersion *result, PGconn *conn, return true; } + if (strcmp(value, "3.3") == 0) + { + *result = PG_PROTOCOL(3, 3); + return true; + } + + if (strcmp(value, "latest") == 0) + { + *result = PG_PROTOCOL_LATEST; + return true; + } + libpq_append_conn_error(conn, "invalid %s value: \"%s\"", context, value); return false; diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index b3af70fa09b..0b113b271ea 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -1405,7 +1405,23 @@ test_protocol_version(PGconn *conn) PQfinish(conn); /* - * Test max_protocol_version=latest. 'latest' currently means '3.2'. + * Test max_protocol_version=3.3 + */ + vals[max_protocol_version_index] = "3.3"; + conn = PQconnectdbParams(keywords, vals, false); + + if (PQstatus(conn) != CONNECTION_OK) + pg_fatal("Connection to database failed: %s", + PQerrorMessage(conn)); + + protocol_version = PQfullProtocolVersion(conn); + if (protocol_version != 30003) + pg_fatal("expected 30003, got %d", protocol_version); + + PQfinish(conn); + + /* + * Test max_protocol_version=latest. 'latest' currently means '3.3'. */ vals[max_protocol_version_index] = "latest"; conn = PQconnectdbParams(keywords, vals, false); @@ -1415,8 +1431,8 @@ test_protocol_version(PGconn *conn) PQerrorMessage(conn)); protocol_version = PQfullProtocolVersion(conn); - if (protocol_version != 30002) - pg_fatal("expected 30002, got %d", protocol_version); + if (protocol_version != 30003) + pg_fatal("expected 30003, got %d", protocol_version); PQfinish(conn); -- 2.51.1