MIME-Version: 1.0
From: Mahendra Singh Thalor <mahi6run@gmail.com>
Date: Sun, 15 Mar 2026 09:18:26 +0530
Message-ID: 
 <CAKYtNAqN49Hqd4v0wWH3uW6d6QsH+8e8bR_MVf4CboTZSzd+Aw@mail.gmail.com>
Subject: pg_restore: remove unnecessary code from restore_all_databases
 function
To: PostgreSQL-development <pgsql-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000343599064d07fada"
Archived-At: 
 <https://www.postgresql.org/message-id/CAKYtNAqN49Hqd4v0wWH3uW6d6QsH%2B8e8bR_MVf4CboTZSzd%2BAw%40mail.gmail.com>
Precedence: bulk

--000000000000343599064d07fada
Content-Type: multipart/alternative; boundary="000000000000343597064d07fad8"

--000000000000343597064d07fad8
Content-Type: text/plain; charset="UTF-8"

Hi hackers,

+++ b/src/bin/pg_dump/pg_restore.c
@@ -1268,16 +1268,6 @@ restore_all_databases(const char *inputFileSpec,
                 */
                memcpy(tmpopts, original_opts, sizeof(RestoreOptions));

-               /*
-                * We need to reset override_dbname so that objects can be
restored
-                * into an already created database. (used with -d/--dbname
option)
-                */
-               if (tmpopts->cparams.override_dbname)
-               {
-                       pfree(tmpopts->cparams.override_dbname);
-                       tmpopts->cparams.override_dbname = NULL;
-               }
-

In commit 77152d26efefde2eed4, we added some functions and we missed to
remove some unnecessary lines. Those lines are not needed as we are using
memcpy to get the original copy before these lines.

Here, I am attaching a patch to fix this. Please review it.

-- 
Thanks and Regards
Mahendra Singh Thalor
EnterpriseDB: http://www.enterprisedb.com

--000000000000343597064d07fad8
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Hi hackers,</div><div><br></div><div>+++ b/src/bin/pg=
_dump/pg_restore.c<br>@@ -1268,16 +1268,6 @@ restore_all_databases(const ch=
ar *inputFileSpec,<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0*/<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mem=
cpy(tmpopts, original_opts, sizeof(RestoreOptions));<br>=C2=A0<br>- =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*<br>- =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* We need to reset override_dbname so that o=
bjects can be restored<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0* into an already created database. (used with -d/--dbname option=
)<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/<br>- =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (tmpopts-&gt;cparams.overr=
ide_dbname)<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 {<br>- =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 pfree(tmpopts-&gt;cparams.override_dbname);<br>- =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tmpopts-&gt;cparams=
.override_dbname =3D NULL;<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 }<br>-<br><br></div><div>In commit 77152d26efefde2eed4, we added som=
e functions and we missed to remove some unnecessary lines. Those lines are=
 not needed as we are using memcpy to get the original copy before these li=
nes.</div><div><br></div><div>Here, I am attaching a patch to fix this. Ple=
ase review it.</div><br><span class=3D"gmail_signature_prefix">-- </span><b=
r><div dir=3D"ltr" class=3D"gmail_signature" data-smartmail=3D"gmail_signat=
ure">Thanks and Regards<br>Mahendra Singh Thalor<br>EnterpriseDB: <a href=
=3D"http://www.enterprisedb.com" target=3D"_blank">http://www.enterprisedb.=
com</a></div></div>

--000000000000343597064d07fad8--

--000000000000343599064d07fada
Content-Type: text/x-patch; charset="US-ASCII";
	name="v01-pg_restore-remove-unnecessary-code-from-restore_all.patch"
Content-Disposition: attachment;
	filename="v01-pg_restore-remove-unnecessary-code-from-restore_all.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mmr7qk8f0>
X-Attachment-Id: f_mmr7qk8f0

RnJvbSAxNjJiZjc2ZThjNDJiZjEzNGIwNGNiNDk5MzU2MDI2MTA3NzJlOWZmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBNYWhlbmRyYSBTaW5naCBUaGFsb3IgPG1haGk2cnVuQGdtYWls
LmNvbT4KRGF0ZTogU3VuLCAxNSBNYXIgMjAyNiAwOTowMjo1OSArMDUzMApTdWJqZWN0OiBbUEFU
Q0hdIHBnX3Jlc3RvcmU6IHJlbW92ZSB1bm5lY2Vzc2FyeSBjb2RlIGZyb20KIHJlc3RvcmVfYWxs
X2RhdGFiYXNlcwoKSW4gY29tbWl0IDc3MTUyZDI2ZWZlZmRlMmVlZDQsIHdlIGFkZGVkIHNvbWUg
ZnVuY3Rpb25zIGFuZCB3ZQptaXNzZWQgdG8gcmVtb3ZlIHNvbWUgdW5uZWNlc3NhcnkgbGluZXMg
YXMgYmVmb3JlIHRoZXNlIGxpbmVzCndlIGFyZSB1c2luZyBtZW1jcHkgdG8gZ2V0IG9yaWdpbmFs
IGNvcHkuCi0tLQogc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYyB8IDEwIC0tLS0tLS0tLS0K
IDEgZmlsZSBjaGFuZ2VkLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmluL3Bn
X2R1bXAvcGdfcmVzdG9yZS5jIGIvc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYwppbmRleCBm
YjQ0YzBjZmRmZS4uOWI0YjE1MWIzMTggMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfZHVtcC9wZ19y
ZXN0b3JlLmMKKysrIGIvc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYwpAQCAtMTI2OCwxNiAr
MTI2OCw2IEBAIHJlc3RvcmVfYWxsX2RhdGFiYXNlcyhjb25zdCBjaGFyICppbnB1dEZpbGVTcGVj
LAogCQkgKi8KIAkJbWVtY3B5KHRtcG9wdHMsIG9yaWdpbmFsX29wdHMsIHNpemVvZihSZXN0b3Jl
T3B0aW9ucykpOwogCi0JCS8qCi0JCSAqIFdlIG5lZWQgdG8gcmVzZXQgb3ZlcnJpZGVfZGJuYW1l
IHNvIHRoYXQgb2JqZWN0cyBjYW4gYmUgcmVzdG9yZWQKLQkJICogaW50byBhbiBhbHJlYWR5IGNy
ZWF0ZWQgZGF0YWJhc2UuICh1c2VkIHdpdGggLWQvLS1kYm5hbWUgb3B0aW9uKQotCQkgKi8KLQkJ
aWYgKHRtcG9wdHMtPmNwYXJhbXMub3ZlcnJpZGVfZGJuYW1lKQotCQl7Ci0JCQlwZnJlZSh0bXBv
cHRzLT5jcGFyYW1zLm92ZXJyaWRlX2RibmFtZSk7Ci0JCQl0bXBvcHRzLT5jcGFyYW1zLm92ZXJy
aWRlX2RibmFtZSA9IE5VTEw7Ci0JCX0KLQogCQlzbnByaW50ZihzdWJkaXJkYnBhdGgsIE1BWFBH
UEFUSCwgIiVzL2RhdGFiYXNlcyIsIGlucHV0RmlsZVNwZWMpOwogCiAJCS8qCi0tIAoyLjUyLjAK
Cg==
--000000000000343599064d07fada--