MIME-Version: 1.0
References: 
 <CAJ9T6SuRougj0rUJai0BdSRY17kPPCi7w0cbEv6DSLeEn2e0mw@mail.gmail.com>
 <CA+OCxoxHneaUCAyhTPa1MfiuDTr6JhUfHzyaE4NBt-y1FMOXaA@mail.gmail.com>
In-Reply-To: 
 <CA+OCxoxHneaUCAyhTPa1MfiuDTr6JhUfHzyaE4NBt-y1FMOXaA@mail.gmail.com>
From: Pradip Parkale <pradip.parkale@enterprisedb.com>
Date: Thu, 1 Apr 2021 11:40:00 +0530
Message-ID: 
 <CAJ9T6SvVw-Q1M-baSPc6tzvoO7q+em39Pq=bzeb869gEDMLM4Q@mail.gmail.com>
Subject: Re: [pgAdmin][RM5519]: Unable to close tab after disconnecting
 server.
To: Dave Page <dpage@pgadmin.org>
Cc: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000876c3c05bee315e1"
Archived-At: 
 <https://www.postgresql.org/message-id/CAJ9T6SvVw-Q1M-baSPc6tzvoO7q%2Bem39Pq%3Dbzeb869gEDMLM4Q%40mail.gmail.com>
Precedence: bulk

--000000000000876c3c05bee315e1
Content-Type: multipart/alternative; boundary="000000000000876c3b05bee315df"

--000000000000876c3b05bee315df
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Please find the updated patch with the change mentioned by Dave.

On Wed, Mar 31, 2021 at 7:53 PM Dave Page <dpage@pgadmin.org> wrote:

> Thanks Pradip.
>
> Before this is committed, let's change this:
>
> gettext('Current trasaction is not commited because server is
> disconnected.'),
>
> to:
>
> gettext('The current transaction has been rolled back because the server
> was disconnected.'),
>
> On Wed, Mar 31, 2021 at 3:09 PM Pradip Parkale <
> pradip.parkale@enterprisedb.com> wrote:
>
>> Hi Hackers,
>> Please find the attached patch for #5519. Updated the existing
>> confirmation message and also added a new confirmation dialog before
>> closing the query tool if the server is disconnected.
>>
>> --
>> Thanks & Regards,
>> Pradip Parkale
>> Software Engineer | EnterpriseDB Corporation
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EDB: http://www.enterprisedb.com
>
>

-- 
Thanks & Regards,
Pradip Parkale
Software Engineer | EnterpriseDB Corporation

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

<div dir=3D"ltr">Hi Hackers,<div><br></div><div>Please find the updated pat=
ch with the change mentioned by Dave.</div></div><br><div class=3D"gmail_qu=
ote"><div dir=3D"ltr" class=3D"gmail_attr">On Wed, Mar 31, 2021 at 7:53 PM =
Dave Page &lt;<a href=3D"mailto:dpage@pgadmin.org">dpage@pgadmin.org</a>&gt=
; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px=
 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:=
rgb(204,204,204);padding-left:1ex"><div dir=3D"ltr"><div dir=3D"ltr"><div d=
ir=3D"ltr">Thanks Pradip.<div><br></div><div>Before this is committed, let&=
#39;s change this:</div><div><br></div><div>gettext(&#39;Current trasaction=
 is not commited because server is disconnected.&#39;),<br></div><div><br><=
/div><div>to:</div><div><br></div><div>gettext(&#39;The current transaction=
 has been rolled back because the server was disconnected.&#39;),<br></div>=
</div></div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"=
gmail_attr">On Wed, Mar 31, 2021 at 3:09 PM Pradip Parkale &lt;<a href=3D"m=
ailto:pradip.parkale@enterprisedb.com" target=3D"_blank">pradip.parkale@ent=
erprisedb.com</a>&gt; wrote:<br></div><blockquote class=3D"gmail_quote" sty=
le=3D"margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:soli=
d;border-left-color:rgb(204,204,204);padding-left:1ex"><div dir=3D"ltr">Hi =
Hackers,<div>Please find the attached patch for #5519. Updated the existing=
 confirmation message and also added a new confirmation dialog before closi=
ng the query tool if the server is disconnected.<br clear=3D"all"><div><br>=
</div>-- <br><div dir=3D"ltr"><div dir=3D"ltr"><div style=3D"font-size:12.8=
px">Thanks &amp; Regards,<br></div><div style=3D"font-size:12.8px">Pradip P=
arkale<br>Software Engineer | EnterpriseDB Corporation</div></div></div></d=
iv></div>
</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
><div dir=3D"ltr">Dave Page<br>Blog: <a href=3D"http://pgsnake.blogspot.com=
" target=3D"_blank">http://pgsnake.blogspot.com</a><br>Twitter: @pgsnake<br=
><br>EDB: <a href=3D"http://www.enterprisedb.com" target=3D"_blank">http://=
www.enterprisedb.com</a><br><br></div></div>
</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
 class=3D"gmail_signature"><div dir=3D"ltr"><div style=3D"font-size:12.8px"=
>Thanks &amp; Regards,<br></div><div style=3D"font-size:12.8px">Pradip Park=
ale<br>Software Engineer | EnterpriseDB Corporation</div></div></div>

--000000000000876c3b05bee315df--

--000000000000876c3c05bee315e1
Content-Type: application/octet-stream; name="RM5519_v1.patch"
Content-Disposition: attachment; filename="RM5519_v1.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kmyh9sh80>
X-Attachment-Id: f_kmyh9sh80

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5weSBiL3dl
Yi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5weQppbmRleCAzN2NjODljNTAuLmRl
Mzg2NGJlNSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5pdF9f
LnB5CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5weQpAQCAtMTE5
LDYgKzExOSw3IEBAIGNsYXNzIFNxbEVkaXRvck1vZHVsZShQZ0FkbWluTW9kdWxlKToKICAgICAg
ICAgICAgICdzcWxlZGl0b3IuZ2V0X25ld19jb25uZWN0aW9uX2RhdGEnLAogICAgICAgICAgICAg
J3NxbGVkaXRvci5nZXRfbmV3X2Nvbm5lY3Rpb25fZGF0YWJhc2UnLAogICAgICAgICAgICAgJ3Nx
bGVkaXRvci5nZXRfbmV3X2Nvbm5lY3Rpb25fdXNlcicsCisgICAgICAgICAgICAnc3FsZWRpdG9y
Ll9jaGVja19zZXJ2ZXJfY29ubmVjdGlvbl9zdGF0dXMnLAogICAgICAgICAgICAgJ3NxbGVkaXRv
ci5nZXRfbmV3X2Nvbm5lY3Rpb25fcm9sZScsCiAgICAgICAgICAgICAnc3FsZWRpdG9yLmNvbm5l
Y3Rfc2VydmVyJywKICAgICAgICAgICAgICdzcWxlZGl0b3IuY29ubmVjdF9zZXJ2ZXJfd2l0aF91
c2VyJywKQEAgLTE0NzksNiArMTQ4MCw0OSBAQCBkZWYgZ2V0X2ZpbHRlcl9kYXRhKHRyYW5zX2lk
KToKICAgICByZXR1cm4gRmlsdGVyRGlhbG9nLmdldChzdGF0dXMsIGVycm9yX21zZywgY29ubiwg
dHJhbnNfb2JqLCBzZXNzaW9uX29iKQogCiAKK0BibHVlcHJpbnQucm91dGUoCisgICAgJy9nZXRf
c2VydmVyX2Nvbm5lY3Rpb24vPGludDpzZ2lkPi88aW50OnNpZD4nLAorICAgIG1ldGhvZHM9WyJH
RVQiXSwgZW5kcG9pbnQ9J19jaGVja19zZXJ2ZXJfY29ubmVjdGlvbl9zdGF0dXMnCispCitAbG9n
aW5fcmVxdWlyZWQKK2RlZiBfY2hlY2tfc2VydmVyX2Nvbm5lY3Rpb25fc3RhdHVzKHNnaWQsIHNp
ZD1Ob25lKToKKyAgICAiIiIKKyAgICBUaGlzIGZ1bmN0aW9uIHJldHVybnMgdGhlIHNlcnZlciBj
b25uZWN0aW9uIGRldGFpbHMKKyAgICAiIiIKKyAgICB0cnk6CisgICAgICAgIGRyaXZlciA9IGdl
dF9kcml2ZXIoUEdfREVGQVVMVF9EUklWRVIpCisgICAgICAgIGZyb20gcGdhZG1pbi5icm93c2Vy
LnNlcnZlcl9ncm91cHMuc2VydmVycyBpbXBvcnQgXAorICAgICAgICAgICAgc2VydmVyX2ljb25f
YW5kX2JhY2tncm91bmQKKyAgICAgICAgc2VydmVyID0gU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgK
KyAgICAgICAgICAgIGlkPXNpZCkuZmlyc3QoKQorCisgICAgICAgIG1hbmFnZXIgPSBkcml2ZXIu
Y29ubmVjdGlvbl9tYW5hZ2VyKHNlcnZlci5pZCkKKyAgICAgICAgY29ubiA9IG1hbmFnZXIuY29u
bmVjdGlvbigpCisgICAgICAgIGNvbm5lY3RlZCA9IGNvbm4uY29ubmVjdGVkKCkKKworICAgICAg
ICBtc2cgPSAiU3VjY2VzcyIKKyAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKKyAg
ICAgICAgICAgIGRhdGE9eworICAgICAgICAgICAgICAgICdzdGF0dXMnOiBUcnVlLAorICAgICAg
ICAgICAgICAgICdtc2cnOiBtc2csCisgICAgICAgICAgICAgICAgJ3Jlc3VsdCc6IHsKKyAgICAg
ICAgICAgICAgICAgICAgJ3NlcnZlcic6IGNvbm5lY3RlZAorICAgICAgICAgICAgICAgIH0KKyAg
ICAgICAgICAgIH0KKyAgICAgICAgKQorCisgICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAg
cmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKKyAgICAgICAgICAgIGRhdGE9eworICAgICAgICAg
ICAgICAgICdzdGF0dXMnOiBGYWxzZSwKKyAgICAgICAgICAgICAgICAnbXNnJzogRVJST1JfRkVU
Q0hJTkdfREFUQSwKKyAgICAgICAgICAgICAgICAncmVzdWx0JzogeworICAgICAgICAgICAgICAg
ICAgICAnc2VydmVyJzogRmFsc2UKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9Cisg
ICAgICAgICkKKworCiBAYmx1ZXByaW50LnJvdXRlKAogICAgICcvbmV3X2Nvbm5lY3Rpb25fZGlh
bG9nLzxpbnQ6c2dpZD4vPGludDpzaWQ+JywKICAgICBtZXRob2RzPVsiR0VUIl0sIGVuZHBvaW50
PSdnZXRfbmV3X2Nvbm5lY3Rpb25fZGF0YScKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xz
L3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3Fs
ZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKaW5kZXggYjg3MDUxYmY3Li5iMmE5NjQ1Mzgg
MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRp
dG9yLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRp
dG9yLmpzCkBAIC00ODA5LDcgKzQ4MDksNyBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5dG9vbCcsIFsK
ICAgICAgICAgZWxzZSBpZiAoIWlnbm9yZV91bnNhdmVkX3F1ZXJ5ICYmIHNlbGYuaXNfcXVlcnlf
dG9vbAogICAgICAgICAgICAgICAgICAgICYmIHNlbGYuaXNfcXVlcnlfY2hhbmdlZAogICAgICAg
ICAgICAgICAgICAgICYmIHNlbGYucHJlZmVyZW5jZXMucHJvbXB0X3NhdmVfcXVlcnlfY2hhbmdl
cykgewotICAgICAgICAgIG1zZyA9IGdldHRleHQoJ1RoZSB0ZXh0IGhhcyBjaGFuZ2VkLiBEbyB5
b3Ugd2FudCB0byBzYXZlIGNoYW5nZXM/Jyk7CisgICAgICAgICAgbXNnID0gZ2V0dGV4dCgnVGhl
IHF1ZXJ5IHRleHQgaGFzIGNoYW5nZWQuIERvIHlvdSB3YW50IHRvIHNhdmUgY2hhbmdlcz8nKTsK
ICAgICAgICAgICBzZWxmLnVuc2F2ZWRfY2hhbmdlc191c2VyX2NvbmZpcm1hdGlvbihtc2csIGZh
bHNlKTsKICAgICAgICAgfSAvLyBJZiBhIHRyYW5zYWN0aW9uIGlzIGN1cnJlbnRseSBvbmdvaW5n
CiAgICAgICAgIGVsc2UgaWYgKHNlbGYucHJlZmVyZW5jZXMucHJvbXB0X2NvbW1pdF90cmFuc2Fj
dGlvbgpAQCAtNDkzOCwxNCArNDkzOCw0NCBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5dG9vbCcsIFsK
ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgY2FzZSAxOiAvLyBEb24ndCBT
YXZlCiAgICAgICAgICAgICAgICAgc2VsZi5jbG9zZV9vbl9zYXZlID0gZmFsc2U7Ci0gICAgICAg
ICAgICAgICAgaWYodGhpcy5pc191bnNhdmVkX2RhdGEpCi0gICAgICAgICAgICAgICAgICBzZWxm
Lmlnbm9yZV9vbl9jbG9zZS51bnNhdmVkX2RhdGEgPSB0cnVlOwotICAgICAgICAgICAgICAgIGVs
c2UKLSAgICAgICAgICAgICAgICAgIHNlbGYuaWdub3JlX29uX2Nsb3NlLnVuc2F2ZWRfcXVlcnkg
PSB0cnVlOwotICAgICAgICAgICAgICAgIC8vIEdvIGJhY2sgdG8gY2hlY2sgZm9yIGFueSBvdGhl
ciBuZWVkZWQgY29uZmlybWF0aW9ucyBiZWZvcmUgY2xvc2luZwotICAgICAgICAgICAgICAgIGlm
ICghc2VsZi5jaGVja19uZWVkZWRfY29uZmlybWF0aW9uc19iZWZvcmVfY2xvc2luZ19wYW5lbCgp
KXsKLSAgICAgICAgICAgICAgICAgIGNsb3NlRXZlbnQuY2FuY2VsID0gdHJ1ZTsKLSAgICAgICAg
ICAgICAgICB9CisgICAgICAgICAgICAgICAgJC5hamF4KHsKKyAgICAgICAgICAgICAgICAgIHVy
bDogdXJsX2Zvcignc3FsZWRpdG9yLl9jaGVja19zZXJ2ZXJfY29ubmVjdGlvbl9zdGF0dXMnLCB7
CisgICAgICAgICAgICAgICAgICAgICdzaWQnOiBzZWxmLnVybF9wYXJhbXMuc2lkLAorICAgICAg
ICAgICAgICAgICAgICAnc2dpZCc6IHNlbGYudXJsX3BhcmFtcy5zZ2lkLAorICAgICAgICAgICAg
ICAgICAgfSksCisgICAgICAgICAgICAgICAgICBoZWFkZXJzOiB7CisgICAgICAgICAgICAgICAg
ICAgICdDYWNoZS1Db250cm9sJyA6ICduby1jYWNoZScsCisgICAgICAgICAgICAgICAgICB9LAor
ICAgICAgICAgICAgICAgIH0pLmRvbmUoZnVuY3Rpb24gKHJlcykgeworICAgICAgICAgICAgICAg
ICAgbGV0IHJlc3BvbnNlID0gcmVzLmRhdGEucmVzdWx0LnNlcnZlcjsKKyAgICAgICAgICAgICAg
ICAgIGlmKHJlc3BvbnNlKXsKKyAgICAgICAgICAgICAgICAgICAgY2xvc2VFdmVudC5jYW5jZWwg
PSB0cnVlOworICAgICAgICAgICAgICAgICAgICBpZih0aGlzLmlzX3Vuc2F2ZWRfZGF0YSkKKyAg
ICAgICAgICAgICAgICAgICAgICBzZWxmLmlnbm9yZV9vbl9jbG9zZS51bnNhdmVkX2RhdGEgPSB0
cnVlOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgc2Vs
Zi5pZ25vcmVfb25fY2xvc2UudW5zYXZlZF9xdWVyeSA9IHRydWU7CisgICAgICAgICAgICAgICAg
ICAgICAgLy8gR28gYmFjayB0byBjaGVjayBmb3IgYW55IG90aGVyIG5lZWRlZCBjb25maXJtYXRp
b25zIGJlZm9yZSBjbG9zaW5nCisgICAgICAgICAgICAgICAgICAgIGlmICghc2VsZi5jaGVja19u
ZWVkZWRfY29uZmlybWF0aW9uc19iZWZvcmVfY2xvc2luZ19wYW5lbCgpKXsKKyAgICAgICAgICAg
ICAgICAgICAgICBjbG9zZUV2ZW50LmNhbmNlbCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAg
IH0KKyAgICAgICAgICAgICAgICAgIH1lbHNleworICAgICAgICAgICAgICAgICAgICBhbGVydGlm
eS5jb25maXJtKAorICAgICAgICAgICAgICAgICAgICAgIGdldHRleHQoJ1dhcm5pbmcnKSwKKyAg
ICAgICAgICAgICAgICAgICAgICBnZXR0ZXh0KCdUaGUgY3VycmVudCB0cmFuc2FjdGlvbiBoYXMg
YmVlbiByb2xsZWQgYmFjayBiZWNhdXNlIHRoZSBzZXJ2ZXIgd2FzIGRpc2Nvbm5lY3RlZCcpLAor
ICAgICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICAg
ICAgLy8gQ2xvc2UgdGhlIHF1ZXJ5IHRvb2wgaWYgc2VydmVyIGlzIGRpc2Nvbm5lY3RlZC4KKyAg
ICAgICAgICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4geyBzZWxmLmNsb3NlKCk7IH0s
IDIwMCk7CisgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgICBm
dW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAg
ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgKS5zZXQoJ2xhYmVscycsIHsK
KyAgICAgICAgICAgICAgICAgICAgICBvazogZ2V0dGV4dCgnT2snKQorICAgICAgICAgICAgICAg
ICAgICB9KTsKKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9KS5mYWlsKGZ1
bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgLyogZmFpbHVyZSBzaG91bGQgYmUgaWdub3Jl
ZCAqLworICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg
ICAgICAgICBjYXNlIDI6IC8vU2F2ZQogICAgICAgICAgICAgICAgIHNlbGYuY2xvc2Vfb25fc2F2
ZSA9IHRydWU7Cg==
--000000000000876c3c05bee315e1--