MIME-Version: 1.0
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Mon, 26 Oct 2020 18:18:14 +0530
Message-ID: 
 <CAOBg0APR8utcM8MyUaHRBg6K0SongLe-BQN=dcSupoFbfHvF4w@mail.gmail.com>
Subject: [pgAdmin][RM-4230]: Resolved issues in Rename tab
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000b3569805b29258e3"
Precedence: bulk

--000000000000b3569805b29258e3
Content-Type: multipart/alternative; boundary="000000000000b3569605b29258e1"

--000000000000b3569605b29258e1
Content-Type: text/plain; charset="UTF-8"

Hi Team,

I am sending a common patch RM-4232 and RM-4230
Resolved the issues found in the testing.

*RM-4232:*
1. If the user adds a percentage (other than for placeholders) then it is
stripped off.
2. Backslash is getting removed in the connection string if we provide the
backslash(\) in placeholders or the database name contains it.
3. If the user added only spaces( )in placeholders it is not getting reset
to default values.

*RM-4230:*
1. Rename panel option is not working in the debugger.
2. Added Rename panel for schema diff.

-- 
*Thanks & Regards,*
*Nikhil Mohite*
*Software Engineer.*
*EDB Postgres* <https://www.enterprisedb.com/>
*Mob.No: +91-7798364578.*

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

<div dir=3D"ltr">Hi Team,<div><br></div><div>I am sending a common patch RM=
-4232 and RM-4230</div><div>Resolved the issues found in the testing.</div>=
<div><br></div><div><b>RM-4232:</b></div><div>1.=C2=A0<span style=3D"color:=
rgb(51,51,51);font-family:Verdana,sans-serif;font-size:12px">If the user ad=
ds a percentage (other than for placeholders) then it is stripped off.</spa=
n></div><div><font color=3D"#333333" face=3D"Verdana, sans-serif"><span sty=
le=3D"font-size:12px">2. Backslash is getting removed in the connection str=
ing if we provide the backslash(\) in placeholders or the database name con=
tains it.</span></font></div><div><font color=3D"#333333" face=3D"Verdana, =
sans-serif"><span style=3D"font-size:12px">3. If the user added only spaces=
( )in placeholders it is not getting reset to default values.</span></font>=
</div><div><font color=3D"#333333" face=3D"Verdana, sans-serif"><span style=
=3D"font-size:12px"><br></span></font></div><div><font color=3D"#333333" fa=
ce=3D"Verdana, sans-serif"><span style=3D"font-size:12px"><b>RM-4230:</b></=
span></font></div><div><font color=3D"#333333" face=3D"Verdana, sans-serif"=
><span style=3D"font-size:12px">1. Rename panel option is not working in th=
e debugger.</span></font></div><div><font color=3D"#333333" face=3D"Verdana=
, sans-serif"><span style=3D"font-size:12px">2. Added Rename panel for sche=
ma diff.<br clear=3D"all"></span></font><div><br></div>-- <br><div dir=3D"l=
tr" class=3D"gmail_signature" data-smartmail=3D"gmail_signature"><div dir=
=3D"ltr"><b><font face=3D"verdana, sans-serif">Thanks &amp; Regards,</font>=
</b><div><b><font face=3D"verdana, sans-serif">Nikhil Mohite</font></b></di=
v><div><b><font face=3D"verdana, sans-serif">Software Engineer.</font></b><=
/div><div><a href=3D"https://www.enterprisedb.com/" target=3D"_blank"><b><f=
ont face=3D"verdana, sans-serif">EDB Postgres</font></b></a></div><div><b><=
font face=3D"verdana, sans-serif">Mob.No: +91-7798364578.</font></b></div><=
/div></div></div></div>

--000000000000b3569605b29258e1--

--000000000000b3569805b29258e3
Content-Type: application/octet-stream; name="RM_4232_and_RM_4230.patch"
Content-Disposition: attachment; filename="RM_4232_and_RM_4230.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kgqjbncj0>
X-Attachment-Id: f_kgqjbncj0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3ByZWZlcmVuY2VzL19faW5pdF9fLnB5IGIvd2ViL3Bn
YWRtaW4vcHJlZmVyZW5jZXMvX19pbml0X18ucHkKaW5kZXggZDA1YzFjOC4uZjAwODU1MSAxMDA2
NDQKLS0tIGEvd2ViL3BnYWRtaW4vcHJlZmVyZW5jZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn
YWRtaW4vcHJlZmVyZW5jZXMvX19pbml0X18ucHkKQEAgLTIwMiw2ICsyMDIsMTIgQEAgZGVmIHNh
dmUocGlkKToKICAgICAiIiIKICAgICBkYXRhID0gcmVxdWVzdC5mb3JtIGlmIHJlcXVlc3QuZm9y
bSBlbHNlIGpzb24ubG9hZHMocmVxdWVzdC5kYXRhLmRlY29kZSgpKQogCisgICAgaWYgZGF0YVsn
bmFtZSddIGluIFsndndfZWR0X3RhYl90aXRsZV9wbGFjZWhvbGRlcicsCisgICAgICAgICAgICAg
ICAgICAgICAgICAncXRfdGFiX3RpdGxlX3BsYWNlaG9sZGVyJywKKyAgICAgICAgICAgICAgICAg
ICAgICAgICdkZWJ1Z2dlcl90YWJfdGl0bGVfcGxhY2Vob2xkZXInXToKKyAgICAgICAgaWYgZGF0
YVsndmFsdWUnXS5pc3NwYWNlKCk6CisgICAgICAgICAgICBkYXRhWyd2YWx1ZSddID0gJycKKwog
ICAgIHJlcywgbXNnID0gUHJlZmVyZW5jZXMuc2F2ZSgKICAgICAgICAgZGF0YVsnbWlkJ10sIGRh
dGFbJ2NhdGVnb3J5X2lkJ10sIGRhdGFbJ2lkJ10sIGRhdGFbJ3ZhbHVlJ10pCiAgICAgc2dtLmdl
dF9ub2RlcyhzZ20pCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y
L25ld19jb25uZWN0aW9uX2RpYWxvZy5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0
b3IvbmV3X2Nvbm5lY3Rpb25fZGlhbG9nLmpzCmluZGV4IGIxOWE1MGEuLjE5YmRmN2QgMTAwNjQ0
Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbmV3X2Nvbm5lY3Rpb25fZGlh
bG9nLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbmV3X2Nvbm5lY3Rp
b25fZGlhbG9nLmpzCkBAIC0yMDEsMjIgKzIwMSwxNyBAQCBsZXQgTmV3Q29ubmVjdGlvbkRpYWxv
ZyA9IHsKICAgICAgICAgICAgICAgbGV0IHRhYl90aXRsZSA9ICcnOwogCiAgICAgICAgICAgICAg
IHZhciBxdF90aXRsZV9wbGFjZWhvbGRlciA9IHByZWZlcmVuY2VzWydxdF90YWJfdGl0bGVfcGxh
Y2Vob2xkZXInXTsKLSAgICAgICAgICAgICAgdmFyIHBsYWNlaG9sZGVycyA9IHF0X3RpdGxlX3Bs
YWNlaG9sZGVyLnNwbGl0KCclJyk7Ci0gICAgICAgICAgICAgIHBsYWNlaG9sZGVycy5mb3JFYWNo
KGZ1bmN0aW9uKHBsYWNlaG9sZGVyKSB7Ci0gICAgICAgICAgICAgICAgaWYocGxhY2Vob2xkZXIg
PT0gJ0RBVEFCQVNFJyl7Ci0gICAgICAgICAgICAgICAgICB0YWJfdGl0bGUgPSB0YWJfdGl0bGUu
Y29uY2F0KHNlbGVjdGVkX2RhdGFiYXNlX25hbWUpOwotICAgICAgICAgICAgICAgIH0gZWxzZSBp
ZihwbGFjZWhvbGRlciA9PSAnVVNFUk5BTUUnKSB7Ci0gICAgICAgICAgICAgICAgICBpZihuZXdD
b25uQ29sbGVjdGlvbk1vZGVsWydyb2xlJ10pIHsKLSAgICAgICAgICAgICAgICAgICAgdGFiX3Rp
dGxlID0gdGFiX3RpdGxlLmNvbmNhdChuZXdDb25uQ29sbGVjdGlvbk1vZGVsWydyb2xlJ10pOwot
ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgdGFiX3RpdGxl
ID0gdGFiX3RpdGxlLmNvbmNhdChuZXdDb25uQ29sbGVjdGlvbk1vZGVsWyd1c2VyJ10pOwotICAg
ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0gZWxzZSBpZihwbGFjZWhvbGRlciA9
PSAnU0VSVkVSJykgewotICAgICAgICAgICAgICAgICAgdGFiX3RpdGxlID0gdGFiX3RpdGxlLmNv
bmNhdChyZXNwb25zZS5zZXJ2ZXJfbmFtZSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlewotICAg
ICAgICAgICAgICAgICAgdGFiX3RpdGxlID0gdGFiX3RpdGxlLmNvbmNhdChwbGFjZWhvbGRlcik7
Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgcXRf
dGl0bGVfcGxhY2Vob2xkZXIgPSBxdF90aXRsZV9wbGFjZWhvbGRlci5yZXBsYWNlKG5ldyBSZWdF
eHAoJyVEQVRBQkFTRSUnKSwgc2VsZWN0ZWRfZGF0YWJhc2VfbmFtZSk7CisKKyAgICAgICAgICAg
ICAgaWYobmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsncm9sZSddKSB7CisgICAgICAgICAgICAgICAg
cXRfdGl0bGVfcGxhY2Vob2xkZXIgPSBxdF90aXRsZV9wbGFjZWhvbGRlci5yZXBsYWNlKG5ldyBS
ZWdFeHAoJyVVU0VSTkFNRSUnKSwgbmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsncm9sZSddKTsKKyAg
ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBxdF90aXRsZV9wbGFjZWhvbGRl
ciA9IHF0X3RpdGxlX3BsYWNlaG9sZGVyLnJlcGxhY2UobmV3IFJlZ0V4cCgnJVVTRVJOQU1FJScp
LCBuZXdDb25uQ29sbGVjdGlvbk1vZGVsWyd1c2VyJ10pOworICAgICAgICAgICAgICB9CisKKyAg
ICAgICAgICAgICAgcXRfdGl0bGVfcGxhY2Vob2xkZXIgPSBxdF90aXRsZV9wbGFjZWhvbGRlci5y
ZXBsYWNlKG5ldyBSZWdFeHAoJyVTRVJWRVIlJyksIHJlc3BvbnNlLnNlcnZlcl9uYW1lKTsKKwor
ICAgICAgICAgICAgICB0YWJfdGl0bGUgPSBxdF90aXRsZV9wbGFjZWhvbGRlcjsKIAogICAgICAg
ICAgICAgICBpZighbmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsncm9sZSddKSB7CiAgICAgICAgICAg
ICAgICAgbmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsncm9sZSddID0gbnVsbDsKZGlmZiAtLWdpdCBh
L3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9kYXRhZ3JpZC5qcyBiL3dlYi9w
Z2FkbWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9kYXRhZ3JpZC5qcwppbmRleCA3ZWE1NDYx
Li4xZjBjMWI3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9kYXRhZ3JpZC9zdGF0aWMv
anMvZGF0YWdyaWQuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvc3RhdGljL2pz
L2RhdGFncmlkLmpzCkBAIC0yMjQsMTAgKzIyNCwxMSBAQCBkZWZpbmUoJ3BnYWRtaW4uZGF0YWdy
aWQnLCBbCiAgICAgICAgICAgcXVlcnlUb29sRm9ybSArPWA8dGV4dGFyZWEgbmFtZT0ic3FsX2Zp
bHRlciIgaGlkZGVuPiR7c3FsX2ZpbHRlcn08L3RleHRhcmVhPmA7CiAgICAgICAgIH0KIAorICAg
ICAgICAvKiBFc2NhcGUgYmFja3NsYXNoZXMgYXMgaXQgaXMgc3RyaXBwZWQgYnkgYmFjayBlbmQg
Ki8KICAgICAgICAgcXVlcnlUb29sRm9ybSArPWAKICAgICAgICAgICA8L2Zvcm0+CiAgICAgICAg
ICAgICA8c2NyaXB0PgotICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGl0
bGUiKS52YWx1ZSA9ICIke18uZXNjYXBlKHBhbmVsX3RpdGxlKX0iOworICAgICAgICAgICAgICBk
b2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGl0bGUiKS52YWx1ZSA9ICIke18uZXNjYXBlKHBhbmVs
X3RpdGxlLnJlcGxhY2UoJ1xcJywgJ1xcXFwnKSl9IjsKICAgICAgICAgICAgICAgZG9jdW1lbnQu
Z2V0RWxlbWVudEJ5SWQoInF1ZXJ5VG9vbEZvcm0iKS5zdWJtaXQoKTsKICAgICAgICAgICAgIDwv
c2NyaXB0PgogICAgICAgICAgIGA7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9kYXRh
Z3JpZC9zdGF0aWMvanMvZGF0YWdyaWRfcGFuZWxfdGl0bGUuanMgYi93ZWIvcGdhZG1pbi90b29s
cy9kYXRhZ3JpZC9zdGF0aWMvanMvZGF0YWdyaWRfcGFuZWxfdGl0bGUuanMKaW5kZXggM2RkY2Zh
ZC4uZTQwZDBjNCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvc3RhdGlj
L2pzL2RhdGFncmlkX3BhbmVsX3RpdGxlLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFn
cmlkL3N0YXRpYy9qcy9kYXRhZ3JpZF9wYW5lbF90aXRsZS5qcwpAQCAtMzksMjAgKzM5LDExIEBA
IGV4cG9ydCBmdW5jdGlvbiBnZXRQYW5lbFRpdGxlKHBnQnJvd3Nlciwgc2VsZWN0ZWRfaXRlbT1u
dWxsLCBjdXN0b21fdGl0bGU9bnVsbCkKICAgICBxdF90aXRsZV9wbGFjZWhvbGRlciA9IHByZWZl
cmVuY2VzWydxdF90YWJfdGl0bGVfcGxhY2Vob2xkZXInXTsKICAgfQogCi0gIHZhciBwbGFjZWhv
bGRlcnMgPSBxdF90aXRsZV9wbGFjZWhvbGRlci5zcGxpdCgnJScpOwotICB2YXIgdGl0bGUgPSAn
JzsKLSAgcGxhY2Vob2xkZXJzLmZvckVhY2goZnVuY3Rpb24ocGxhY2Vob2xkZXIpIHsKLSAgICBp
ZihwbGFjZWhvbGRlciA9PSAnREFUQUJBU0UnKXsKLSAgICAgIHRpdGxlID0gdGl0bGUuY29uY2F0
KGRiX2xhYmVsKTsKLSAgICB9IGVsc2UgaWYocGxhY2Vob2xkZXIgPT0gJ1VTRVJOQU1FJykgewot
ICAgICAgdGl0bGUgPSB0aXRsZS5jb25jYXQocGFyZW50RGF0YS5zZXJ2ZXIudXNlci5uYW1lKTsK
LSAgICB9IGVsc2UgaWYocGxhY2Vob2xkZXIgPT0gJ1NFUlZFUicpIHsKLSAgICAgIHRpdGxlID0g
dGl0bGUuY29uY2F0KHBhcmVudERhdGEuc2VydmVyLmxhYmVsKTsKLSAgICB9IGVsc2V7Ci0gICAg
ICB0aXRsZSA9IHRpdGxlLmNvbmNhdChwbGFjZWhvbGRlcik7Ci0gICAgfQotICB9KTsKLSAgcmV0
dXJuIF8uZXNjYXBlKHRpdGxlKTsKKyAgcXRfdGl0bGVfcGxhY2Vob2xkZXIgPSBxdF90aXRsZV9w
bGFjZWhvbGRlci5yZXBsYWNlKG5ldyBSZWdFeHAoJyVEQVRBQkFTRSUnKSwgZGJfbGFiZWwpOwor
ICBxdF90aXRsZV9wbGFjZWhvbGRlciA9IHF0X3RpdGxlX3BsYWNlaG9sZGVyLnJlcGxhY2UobmV3
IFJlZ0V4cCgnJVVTRVJOQU1FJScpLCBwYXJlbnREYXRhLnNlcnZlci51c2VyLm5hbWUpOworICBx
dF90aXRsZV9wbGFjZWhvbGRlciA9IHF0X3RpdGxlX3BsYWNlaG9sZGVyLnJlcGxhY2UobmV3IFJl
Z0V4cCgnJVNFUlZFUiUnKSwgcGFyZW50RGF0YS5zZXJ2ZXIubGFiZWwpOworCisgIHJldHVybiBf
LmVzY2FwZShxdF90aXRsZV9wbGFjZWhvbGRlcik7CiB9CiAKIGV4cG9ydCBmdW5jdGlvbiBzZXRR
dWVyeVRvb2xEb2NrZXJUaXRsZShwYW5lbCwgaXNfcXVlcnlfdG9vbCwgcGFuZWxfdGl0bGUsIGlz
X2ZpbGUpIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9q
cy9zaG93X2RhdGEuanMgYi93ZWIvcGdhZG1pbi90b29scy9kYXRhZ3JpZC9zdGF0aWMvanMvc2hv
d19kYXRhLmpzCmluZGV4IDc1MzcxZjcuLmY5ZWM1YTggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu
L3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9zaG93X2RhdGEuanMKKysrIGIvd2ViL3BnYWRtaW4v
dG9vbHMvZGF0YWdyaWQvc3RhdGljL2pzL3Nob3dfZGF0YS5qcwpAQCAtMjk3LDIzICsyOTcsMTEg
QEAgZXhwb3J0IGZ1bmN0aW9uIGdlbmVyYXRlRGF0YWdyaWRUaXRsZShwZ0Jyb3dzZXIsIGFjaVRy
ZWVJZGVudGlmaWVyLCBjdXN0b21fdGl0bGUKICAgICBkdGdfdGl0bGVfcGxhY2Vob2xkZXIgPSBw
cmVmZXJlbmNlc1sndndfZWR0X3RhYl90aXRsZV9wbGFjZWhvbGRlciddOwogICB9CiAKLSAgdmFy
IHBsYWNlaG9sZGVycyA9IGR0Z190aXRsZV9wbGFjZWhvbGRlci5zcGxpdCgnJScpOwotICB2YXIg
dGl0bGUgPSAnJzsKLSAgcGxhY2Vob2xkZXJzLmZvckVhY2goZnVuY3Rpb24ocGxhY2Vob2xkZXIp
IHsKLSAgICBpZihwbGFjZWhvbGRlciA9PSAnREFUQUJBU0UnKXsKLSAgICAgIHRpdGxlID0gdGl0
bGUuY29uY2F0KGRiX2xhYmVsKTsKLSAgICB9IGVsc2UgaWYocGxhY2Vob2xkZXIgPT0gJ1VTRVJO
QU1FJykgewotICAgICAgdGl0bGUgPSB0aXRsZS5jb25jYXQocGFyZW50RGF0YS5zZXJ2ZXIudXNl
ci5uYW1lKTsKLSAgICB9IGVsc2UgaWYocGxhY2Vob2xkZXIgPT0gJ1NFUlZFUicpIHsKLSAgICAg
IHRpdGxlID0gdGl0bGUuY29uY2F0KHBhcmVudERhdGEuc2VydmVyLmxhYmVsKTsKLSAgICB9IGVs
c2UgaWYocGxhY2Vob2xkZXIgPT0gJ1NDSEVNQScpIHsKLSAgICAgIHRpdGxlID0gdGl0bGUuY29u
Y2F0KG5hbWVzcGFjZU5hbWUpOwotICAgIH0gZWxzZSBpZihwbGFjZWhvbGRlciA9PSAnVEFCTEUn
KSB7Ci0gICAgICB0aXRsZSA9IHRpdGxlLmNvbmNhdChub2RlLmdldERhdGEoKS5sYWJlbCk7Ci0g
ICAgfSBlbHNlewotICAgICAgdGl0bGUgPSB0aXRsZS5jb25jYXQocGxhY2Vob2xkZXIpOwotICAg
IH0KLSAgfSk7CisgIGR0Z190aXRsZV9wbGFjZWhvbGRlciA9IGR0Z190aXRsZV9wbGFjZWhvbGRl
ci5yZXBsYWNlKG5ldyBSZWdFeHAoJyVEQVRBQkFTRSUnKSwgZGJfbGFiZWwpOworICBkdGdfdGl0
bGVfcGxhY2Vob2xkZXIgPSBkdGdfdGl0bGVfcGxhY2Vob2xkZXIucmVwbGFjZShuZXcgUmVnRXhw
KCclVVNFUk5BTUUlJyksIHBhcmVudERhdGEuc2VydmVyLnVzZXIubmFtZSk7CisgIGR0Z190aXRs
ZV9wbGFjZWhvbGRlciA9IGR0Z190aXRsZV9wbGFjZWhvbGRlci5yZXBsYWNlKG5ldyBSZWdFeHAo
JyVTRVJWRVIlJyksIHBhcmVudERhdGEuc2VydmVyLmxhYmVsKTsKKyAgZHRnX3RpdGxlX3BsYWNl
aG9sZGVyID0gZHRnX3RpdGxlX3BsYWNlaG9sZGVyLnJlcGxhY2UobmV3IFJlZ0V4cCgnJVNDSEVN
QSUnKSwgbmFtZXNwYWNlTmFtZSk7CisgIGR0Z190aXRsZV9wbGFjZWhvbGRlciA9IGR0Z190aXRs
ZV9wbGFjZWhvbGRlci5yZXBsYWNlKG5ldyBSZWdFeHAoJyVUQUJMRSUnKSwgbm9kZS5nZXREYXRh
KCkubGFiZWwpOwogCi0gIHJldHVybiBfLmVzY2FwZSh0aXRsZSk7CisgIHJldHVybiBfLmVzY2Fw
ZShkdGdfdGl0bGVfcGxhY2Vob2xkZXIpOwogfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9v
bHMvZGVidWdnZXIvc3RhdGljL2pzL2RlYnVnZ2VyLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGVi
dWdnZXIvc3RhdGljL2pzL2RlYnVnZ2VyLmpzCmluZGV4IDYxMDU2ZjIuLmVjOTI1MGEgMTAwNjQ0
Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL3N0YXRpYy9qcy9kZWJ1Z2dlci5qcwor
KysgYi93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9zdGF0aWMvanMvZGVidWdnZXIuanMKQEAg
LTU3OSw2ICs1NzksMjEgQEAgZGVmaW5lKFsKICAgICAgICAgICAgICAgICAgICAgICBtZXRob2Q6
ICdERUxFVEUnLAogICAgICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICAgIH0p
OworCisgICAgICAgICAgICAgICAgICAvLyBQYW5lbCBSZW5hbWUgZXZlbnQKKyAgICAgICAgICAg
ICAgICAgIHBhbmVsLm9uKHdjRG9ja2VyLkVWRU5ULlJFTkFNRSwgZnVuY3Rpb24ocGFuZWxfZGF0
YSkgeworICAgICAgICAgICAgICAgICAgICBBbGVydGlmeS5wcm9tcHQoJycsIHBhbmVsX2RhdGEu
JHRpdGxlVGV4dFswXS50ZXh0Q29udGVudCwKKyAgICAgICAgICAgICAgICAgICAgICAvLyBXZSB3
aWxsIGV4ZWN1dGUgdGhpcyBmdW5jdGlvbiB3aGVuIHVzZXIgY2xpY2tzIG9uIHRoZSBPSyBidXR0
b24KKyAgICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbihldnQsIHZhbHVlKSB7CisgICAgICAg
ICAgICAgICAgICAgICAgICBpZih2YWx1ZSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICBk
ZWJ1Z2dlclV0aWxzLnNldERlYnVnZ2VyVGl0bGUocGFuZWwsIHNlbGYucHJlZmVyZW5jZXMsIHRy
ZWVJbmZvLmZ1bmN0aW9uLmxhYmVsLCB0cmVlSW5mby5zY2hlbWEubGFiZWwsIHRyZWVJbmZvLmRh
dGFiYXNlLmxhYmVsLCB2YWx1ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg
ICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgICAvLyBXZSB3aWxsIGV4ZWN1
dGUgdGhpcyBmdW5jdGlvbiB3aGVuIHVzZXIgY2xpY2tzIG9uIHRoZSBDYW5jZWwKKyAgICAgICAg
ICAgICAgICAgICAgICAvLyBidXR0b24uICBEbyBub3RoaW5nIGp1c3QgY2xvc2UgaXQuCisgICAg
ICAgICAgICAgICAgICAgICAgZnVuY3Rpb24oZXZ0KSB7IGV2dC5jYW5jZWwgPSBmYWxzZTsgfQor
ICAgICAgICAgICAgICAgICAgICApLnNldCh7J3RpdGxlJzogZ2V0dGV4dCgnUmVuYW1lIFBhbmVs
Jyl9KTsKKyAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg
ICAgICAgfSkKICAgICAgICAgICAgICAgLmZhaWwoZnVuY3Rpb24oZSkgewpkaWZmIC0tZ2l0IGEv
d2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIvc3RhdGljL2pzL2RlYnVnZ2VyX3V0aWxzLmpzIGIv
d2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIvc3RhdGljL2pzL2RlYnVnZ2VyX3V0aWxzLmpzCmlu
ZGV4IDU1MjViZmMuLjI0NTFjNjAgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVn
Z2VyL3N0YXRpYy9qcy9kZWJ1Z2dlcl91dGlscy5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9k
ZWJ1Z2dlci9zdGF0aWMvanMvZGVidWdnZXJfdXRpbHMuanMKQEAgLTUwLDMzICs1MCwyMSBAQCBm
dW5jdGlvbiBzZXREZWJ1Z2dlclRpdGxlKHBhbmVsLCBwcmVmZXJlbmNlcywgZnVuY3Rpb25fbmFt
ZSwgc2NoZW1hX25hbWUsIGRhdGFiYQogICAgIGRlYnVnZ2VyX3RpdGxlX3BsYWNlaG9sZGVyID0g
cHJlZmVyZW5jZXNbJ2RlYnVnZ2VyX3RhYl90aXRsZV9wbGFjZWhvbGRlciddOwogICB9CiAKLSAg
dmFyIHBsYWNlaG9sZGVycyA9IGRlYnVnZ2VyX3RpdGxlX3BsYWNlaG9sZGVyLnNwbGl0KCclJyk7
CisgIHZhciBmdW5jdGlvbl9kYXRhID0gZnVuY3Rpb25fbmFtZS5zcGxpdCgnKCcpOworICBmdW5j
dGlvbl9uYW1lID0gZ2V0X2Z1bmN0aW9uX25hbWUoZnVuY3Rpb25fbmFtZSk7CisKKyAgdmFyIGFy
Z3NfbGlzdCA9IGZ1bmN0aW9uX2RhdGFbZnVuY3Rpb25fZGF0YS5sZW5ndGggLSAxXS5zcGxpdCgn
KScpOworICB2YXIgYXJncyA9ICcnOworICBpZihhcmdzX2xpc3QubGVuZ3RoID4gMCkgeworICAg
IGFyZ3MgPSBhcmdzLmNvbmNhdChhcmdzX2xpc3RbMF0pOworICB9CiAKLSAgdmFyIHRpdGxlID0g
Jyc7Ci0gIHBsYWNlaG9sZGVycy5mb3JFYWNoKGZ1bmN0aW9uKHBsYWNlaG9sZGVyKSB7Ci0gICAg
aWYocGxhY2Vob2xkZXIgPT0gJ0ZVTkNUSU9OJyl7Ci0gICAgICB2YXIgZnVuY19uYW1lID0gJyc7
Ci0gICAgICBmdW5jX25hbWUgPSBnZXRfZnVuY3Rpb25fbmFtZShmdW5jdGlvbl9uYW1lKTsKKyAg
ZGVidWdnZXJfdGl0bGVfcGxhY2Vob2xkZXIgPSBkZWJ1Z2dlcl90aXRsZV9wbGFjZWhvbGRlci5y
ZXBsYWNlKG5ldyBSZWdFeHAoJyVGVU5DVElPTiUnKSwgZnVuY3Rpb25fbmFtZSk7CisgIGRlYnVn
Z2VyX3RpdGxlX3BsYWNlaG9sZGVyID0gZGVidWdnZXJfdGl0bGVfcGxhY2Vob2xkZXIucmVwbGFj
ZShuZXcgUmVnRXhwKCclQVJHUyUnKSwgYXJncyk7CisgIGRlYnVnZ2VyX3RpdGxlX3BsYWNlaG9s
ZGVyID0gZGVidWdnZXJfdGl0bGVfcGxhY2Vob2xkZXIucmVwbGFjZShuZXcgUmVnRXhwKCclU0NI
RU1BJScpLCBzY2hlbWFfbmFtZSk7CisgIGRlYnVnZ2VyX3RpdGxlX3BsYWNlaG9sZGVyID0gZGVi
dWdnZXJfdGl0bGVfcGxhY2Vob2xkZXIucmVwbGFjZShuZXcgUmVnRXhwKCclREFUQUJBU0UlJyks
IGRhdGFiYXNlX25hbWUpOwogCi0gICAgICB0aXRsZSA9IHRpdGxlLmNvbmNhdChmdW5jX25hbWUp
OwotICAgIH0gZWxzZSBpZihwbGFjZWhvbGRlciA9PSAnQVJHUycpIHsKLSAgICAgIHZhciBhcmdz
ID0gJyc7Ci0gICAgICB2YXIgZnVuY3Rpb25fZGF0YSA9IGZ1bmN0aW9uX25hbWUuc3BsaXQoJygn
KTsKLSAgICAgIHZhciBhcmdzX2xpc3QgPSBmdW5jdGlvbl9kYXRhW2Z1bmN0aW9uX2RhdGEubGVu
Z3RoIC0gMV0uc3BsaXQoJyknKTsKLSAgICAgIGlmKGFyZ3NfbGlzdC5sZW5ndGggPiAwKSB7Ci0g
ICAgICAgIGFyZ3MgPSBhcmdzLmNvbmNhdChhcmdzX2xpc3RbMF0pOwotICAgICAgfQotICAgICAg
ZnVuY3Rpb25fbmFtZSA9IGdldF9mdW5jdGlvbl9uYW1lKGZ1bmN0aW9uX25hbWUpOwotICAgICAg
dGl0bGUgPSB0aXRsZS5jb25jYXQoYXJncyk7Ci0gICAgfSBlbHNlIGlmKHBsYWNlaG9sZGVyID09
ICdTQ0hFTUEnKXsKLSAgICAgIHRpdGxlID0gdGl0bGUuY29uY2F0KHNjaGVtYV9uYW1lKTsKLSAg
ICB9IGVsc2UgaWYocGxhY2Vob2xkZXIgPT0gJ0RBVEFCQVNFJyl7Ci0gICAgICB0aXRsZSA9IHRp
dGxlLmNvbmNhdChkYXRhYmFzZV9uYW1lKTsKLSAgICB9IGVsc2UgaWYgKHBsYWNlaG9sZGVyICE9
ICdBUkdTJyApewotICAgICAgdGl0bGUgPSB0aXRsZS5jb25jYXQocGxhY2Vob2xkZXIpOwotICAg
IH0KLSAgfSk7Ci0gIHBhbmVsLnRpdGxlKCc8c3Bhbj4nKyBfLmVzY2FwZSh0aXRsZSkgKyc8L3Nw
YW4+Jyk7CisgIHBhbmVsLnRpdGxlKCc8c3Bhbj4nKyBfLmVzY2FwZShkZWJ1Z2dlcl90aXRsZV9w
bGFjZWhvbGRlcikgKyc8L3NwYW4+Jyk7CiB9CiAKIGZ1bmN0aW9uIGdldF9mdW5jdGlvbl9uYW1l
KGZ1bmN0aW9uX25hbWUpIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NjaGVtYV9k
aWZmL3N0YXRpYy9qcy9zY2hlbWFfZGlmZi5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NjaGVtYV9k
aWZmL3N0YXRpYy9qcy9zY2hlbWFfZGlmZi5qcwppbmRleCAyMDk5NDE0Li44ODY1ZGY2IDEwMDY0
NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0aWMvanMvc2NoZW1hX2Rp
ZmYuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvc3RhdGljL2pzL3NjaGVt
YV9kaWZmLmpzCkBAIC05LDkgKzksOSBAQAogCiBkZWZpbmUoJ3BnYWRtaW4uc2NoZW1hZGlmZics
IFsKICAgJ3NvdXJjZXMvZ2V0dGV4dCcsICdzb3VyY2VzL3VybF9mb3InLCAnanF1ZXJ5JywgJ3Vu
ZGVyc2NvcmUnLAotICAnc291cmNlcy9wZ2FkbWluJywgJ3NvdXJjZXMvY3NyZicsICdwZ2FkbWlu
LmJyb3dzZXIubm9kZScsCisgICdzb3VyY2VzL3BnYWRtaW4nLCAnc291cmNlcy9jc3JmJywgJ3Bn
YWRtaW4uYWxlcnRpZnlqcycsICdwZ2FkbWluLmJyb3dzZXIubm9kZScsCiBdLCBmdW5jdGlvbigK
LSAgZ2V0dGV4dCwgdXJsX2ZvciwgJCwgXywgcGdBZG1pbiwgY3NyZlRva2VuCisgIGdldHRleHQs
IHVybF9mb3IsICQsIF8sIHBnQWRtaW4sIGNzcmZUb2tlbiwgQWxlcnRpZnksCiApIHsKIAogICB2
YXIgd2NEb2NrZXIgPSB3aW5kb3cud2NEb2NrZXIsCkBAIC0xMTMsNiArMTEzLDIxIEBAIGRlZmlu
ZSgncGdhZG1pbi5zY2hlbWFkaWZmJywgWwogICAgICAgICB2YXIgcHJvcGVydGllc1BhbmVsID0g
cGdCcm93c2VyLmRvY2tlci5maW5kUGFuZWxzKCdwcm9wZXJ0aWVzJyksCiAgICAgICAgICAgc2No
ZW1hRGlmZlBhbmVsID0gcGdCcm93c2VyLmRvY2tlci5hZGRQYW5lbCgnZnJtX3NjaGVtYWRpZmYn
LCB3Y0RvY2tlci5ET0NLLlNUQUNLRUQsIHByb3BlcnRpZXNQYW5lbFswXSk7CiAKKyAgICAgICAg
Ly8gUmVuYW1lIHNjaGVtYSBkaWZmIHRhYgorICAgICAgICBzY2hlbWFEaWZmUGFuZWwub24od2NE
b2NrZXIuRVZFTlQuUkVOQU1FLCBmdW5jdGlvbihwYW5lbF9kYXRhKSB7CisgICAgICAgICAgQWxl
cnRpZnkucHJvbXB0KCcnLCBwYW5lbF9kYXRhLiR0aXRsZVRleHRbMF0udGV4dENvbnRlbnQsCisg
ICAgICAgICAgICAvLyBXZSB3aWxsIGV4ZWN1dGUgdGhpcyBmdW5jdGlvbiB3aGVuIHVzZXIgY2xp
Y2tzIG9uIHRoZSBPSyBidXR0b24KKyAgICAgICAgICAgIGZ1bmN0aW9uKGV2dCwgdmFsdWUpIHsK
KyAgICAgICAgICAgICAgaWYodmFsdWUpIHsKKyAgICAgICAgICAgICAgICBzY2hlbWFEaWZmUGFu
ZWwudGl0bGUoJzxzcGFuPicrIF8uZXNjYXBlKHZhbHVlKSArJzwvc3Bhbj4nKTsKKyAgICAgICAg
ICAgICAgfQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIC8vIFdlIHdpbGwgZXhlY3V0ZSB0
aGlzIGZ1bmN0aW9uIHdoZW4gdXNlciBjbGlja3Mgb24gdGhlIENhbmNlbAorICAgICAgICAgICAg
Ly8gYnV0dG9uLiAgRG8gbm90aGluZyBqdXN0IGNsb3NlIGl0LgorICAgICAgICAgICAgZnVuY3Rp
b24oZXZ0KSB7IGV2dC5jYW5jZWwgPSBmYWxzZTsgfQorICAgICAgICAgICkuc2V0KHsndGl0bGUn
OiBnZXR0ZXh0KCdSZW5hbWUgUGFuZWwnKX0pOworICAgICAgICB9KTsKKwogICAgICAgICAvLyBT
ZXQgcGFuZWwgdGl0bGUgYW5kIGljb24KICAgICAgICAgc2NoZW1hRGlmZlBhbmVsLnRpdGxlKCc8
c3BhbiB0aXRsZT0iJytwYW5lbF90b29sdGlwKyciPicrcGFuZWxfdGl0bGUrJzwvc3Bhbj4nKTsK
ICAgICAgICAgc2NoZW1hRGlmZlBhbmVsLmljb24oJ3BnLWZvbnQtaWNvbiBpY29uLXNjaGVtYS1k
aWZmJyk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0aWMv
anMvc2NoZW1hX2RpZmZfdWkuanMgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0
aWMvanMvc2NoZW1hX2RpZmZfdWkuanMKaW5kZXggYjMwMjVhYS4uZmFkNjQ4NSAxMDA2NDQKLS0t
IGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvc3RhdGljL2pzL3NjaGVtYV9kaWZmX3Vp
LmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NjaGVtYV9kaWZmL3N0YXRpYy9qcy9zY2hlbWFf
ZGlmZl91aS5qcwpAQCAtMTA4LDcgKzEwOCw2IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIFNjaGVt
YURpZmZVSSB7CiAgICAgICAgIHRoaXMucmVzaXplX3BhbmVscygpOwogICAgICAgfS5iaW5kKHNl
bGYpLCAyMDApOwogICAgIH0pOwotCiAgIH0KIAogICByYWlzZV9lcnJvcl9vbl9mYWlsKGFsZXJ0
X3RpdGxlLCB4aHIpIHsK
--000000000000b3569805b29258e3--