pg.ddx.io pgsql-bugs@postgresql.org mailing list archive help / color / mirror / Atom feed From: Nathan Bossart <nathan@postgresql.org>
Subject: [PATCH v1 1/1] attempt multibyte-aware truncation of database names
Date: Wed, 20 Nov 2024 16:30:11 -0600
---
src/backend/utils/init/postinit.c | 46 +++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 3 deletions(-)
inline patch 1: src/backend/utils/init/postinit.c (+43/-3 lines) download inline-1.patch diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 5b657a3f13..c64e8ac849 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -1003,14 +1003,54 @@ InitPostgres(const char *in_dbname, Oid dboid,
{
HeapTuple tuple;
Form_pg_database dbform;
+ char trunc_dbname[NAMEDATALEN];
+
+ strncpy(trunc_dbname, in_dbname, NAMEDATALEN - 1);
+ trunc_dbname[NAMEDATALEN - 1] = '\0';
+
+ tuple = GetDatabaseTuple(trunc_dbname);
+ if (HeapTupleIsValid(tuple))
+ strcpy(dbname, trunc_dbname);
+
+ if (strlen(in_dbname) >= NAMEDATALEN &&
+ IS_HIGHBIT_SET(in_dbname[NAMEDATALEN - 1]) &&
+ IS_HIGHBIT_SET(in_dbname[NAMEDATALEN - 2]))
+ {
+ for (int i = 1; i < MAX_MULTIBYTE_CHAR_LEN - 1; i++)
+ {
+ HeapTuple tmp;
+
+ trunc_dbname[NAMEDATALEN - 1 - i] = '\0';
+ tmp = GetDatabaseTuple(trunc_dbname);
+ if (HeapTupleIsValid(tmp))
+ {
+ if (HeapTupleIsValid(tuple))
+ ereport(FATAL,
+ (errmsg("ambiguous database name")));
+ tuple = tmp;
+ strcpy(dbname, trunc_dbname);
+ }
+
+ if (!IS_HIGHBIT_SET(dbname[NAMEDATALEN - 2 - i]))
+ break;
+ }
+ }
- tuple = GetDatabaseTuple(in_dbname);
if (!HeapTupleIsValid(tuple))
ereport(FATAL,
(errcode(ERRCODE_UNDEFINED_DATABASE),
errmsg("database \"%s\" does not exist", in_dbname)));
dbform = (Form_pg_database) GETSTRUCT(tuple);
dboid = dbform->oid;
+
+ if (MyProcPort && MyProcPort->database_name &&
+ strcmp(MyProcPort->database_name, dbname) != 0)
+ {
+ pfree(MyProcPort->database_name);
+ MyProcPort->database_name = pstrdup(dbname);
+
+ /* XXX: should we fix process title? */
+ }
}
else if (!OidIsValid(dboid))
{
@@ -1067,12 +1107,12 @@ InitPostgres(const char *in_dbname, Oid dboid,
datform = (Form_pg_database) GETSTRUCT(tuple);
if (!HeapTupleIsValid(tuple) ||
- (in_dbname && namestrcmp(&datform->datname, in_dbname)))
+ (in_dbname && namestrcmp(&datform->datname, dbname)))
{
if (in_dbname)
ereport(FATAL,
(errcode(ERRCODE_UNDEFINED_DATABASE),
- errmsg("database \"%s\" does not exist", in_dbname),
+ errmsg("database \"%s\" does not exist", dbname),
errdetail("It seems to have just been dropped or renamed.")));
else
ereport(FATAL,
--
2.39.5 (Apple Git-154)
Message-ID: <no-message-id-25443@localhost>
Permalink: ../no-message-id-25443@localhost/
Also on: postgresql.org/message-id/no-message-id-25443@localhost
copy link · copy postgr.es · copy git am
reply Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-bugs@postgresql.org
Cc: nathan@postgresql.org
Subject: Re: [PATCH v1 1/1] attempt multibyte-aware truncation of database names
In-Reply-To: <no-message-id-25443@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox