MIME-Version: 1.0
From: Pradip Parkale <pradip.parkale@enterprisedb.com>
Date: Tue, 19 Oct 2021 14:31:01 +0530
Message-ID: 
 <CAJ9T6StR12jJW=t3GLToU7JFr9qpxxY+WNeWe8qyjxfG1-33Uw@mail.gmail.com>
Subject: [pgAdmin][RM6780]: While inheriting table, if newly added column
 present in parent table then merge columns
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000003a6e6805ceb0e7c4"
Archived-At: 
 <https://www.postgresql.org/message-id/CAJ9T6StR12jJW%3Dt3GLToU7JFr9qpxxY%2BWNeWe8qyjxfG1-33Uw%40mail.gmail.com>
Precedence: bulk

--0000000000003a6e6805ceb0e7c4
Content-Type: multipart/alternative; boundary="0000000000003a6e6605ceb0e7c2"

--0000000000003a6e6605ceb0e7c2
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Please find the attached patch  which resolved #6780 While inheriting
table, if newly added column present in parent table then merge columns.

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

--0000000000003a6e6605ceb0e7c2
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 attached pa=
tch =C2=A0which resolved #6780=C2=A0While inheriting table, if newly added =
column present in parent table then merge columns.<br clear=3D"all"><div><b=
r></div>-- <br><div dir=3D"ltr" class=3D"gmail_signature" data-smartmail=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 Parkale<br>So=
ftware Engineer | EnterpriseDB Corporation</div></div></div></div></div>

--0000000000003a6e6605ceb0e7c2--

--0000000000003a6e6805ceb0e7c4
Content-Type: application/octet-stream; name="RM6780.patch"
Content-Disposition: attachment; filename="RM6780.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kuxuv79g0>
X-Attachment-Id: f_kuxuv79g0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0aWMvanMvdGFibGUudWkuanMgYi93ZWIvcGdhZG1p
bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMv
c3RhdGljL2pzL3RhYmxlLnVpLmpzCmluZGV4IGE4ZTFiOGNjYS4uZjgxMjdjYzNmIDEwMDY0NAot
LS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv
c2NoZW1hcy90YWJsZXMvc3RhdGljL2pzL3RhYmxlLnVpLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jy
b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0
aWMvanMvdGFibGUudWkuanMKQEAgLTUzNyw3ICs1MzcsMjQgQEAgZXhwb3J0IGRlZmF1bHQgY2xh
c3MgVGFibGVTY2hlbWEgZXh0ZW5kcyBCYXNlVUlTY2hlbWEgewogICAgICAgICAgICAgdGFiQ29s
c1Jlc3BvbnNlLnRoZW4oKHJlcyk9PnsKICAgICAgICAgICAgICAgcmVzb2x2ZSgoc3RhdGUpPT57
CiAgICAgICAgICAgICAgICAgbGV0IGZpbmFsQ29scyA9IHJlcy5tYXAoKGNvbCk9Pm9iai5jb2x1
bW5zU2NoZW1hLmdldE5ld0RhdGEoY29sKSk7Ci0gICAgICAgICAgICAgICAgZmluYWxDb2xzID0g
Wy4uLnN0YXRlLmNvbHVtbnMsIC4uLmZpbmFsQ29sc107CisgICAgICAgICAgICAgICAgbGV0IGN1
cnJlbnRTZWxlY3RlZENvbHMgPSBbXTsKKyAgICAgICAgICAgICAgICBpZiAoIV8uaXNFbXB0eShz
dGF0ZS5jb2x1bW5zKSl7CisgICAgICAgICAgICAgICAgICBjdXJyZW50U2VsZWN0ZWRDb2xzID0g
c3RhdGUuY29sdW1uczsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgbGV0IGNv
bE5hbWVMaXN0ID0gW107CisgICAgICAgICAgICAgICAgc3RhdGUuY29sdW1ucy5mb3JFYWNoKChj
b2w9PnsKKyAgICAgICAgICAgICAgICAgIGNvbE5hbWVMaXN0LnB1c2goY29sLm5hbWUpOworICAg
ICAgICAgICAgICAgIH0pKTsKKyAgICAgICAgICAgICAgICBmb3IgKGxldCBjb2wgb2YgT2JqZWN0
LnZhbHVlcyhmaW5hbENvbHMpKSB7CisgICAgICAgICAgICAgICAgICBpZighY29sTmFtZUxpc3Qu
aW5jbHVkZXMoY29sLm5hbWUpKXsKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudFNlbGVjdGVk
Q29scy5wdXNoKGNvbCk7CisgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQor
CisgICAgICAgICAgICAgICAgaWYgKCFfLmlzRW1wdHkoY3VycmVudFNlbGVjdGVkQ29scykpewor
ICAgICAgICAgICAgICAgICAgZmluYWxDb2xzID0gY3VycmVudFNlbGVjdGVkQ29sczsKKyAgICAg
ICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICBvYmouY2hhbmdlQ29sdW1uT3B0aW9ucyhm
aW5hbENvbHMpOwogICAgICAgICAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICAgICAgICBh
ZGRpbmdfaW5oZXJpdF9jb2xzOiBmYWxzZSwKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNzaW9uL2ph
dmFzY3JpcHQvc2NoZW1hX3VpX2ZpbGVzL3RhYmxlLnVpLnNwZWMuanMgYi93ZWIvcmVncmVzc2lv
bi9qYXZhc2NyaXB0L3NjaGVtYV91aV9maWxlcy90YWJsZS51aS5zcGVjLmpzCmluZGV4IDBkZGY5
YWNjZC4uYzIyNWM1MzJiIDEwMDY0NAotLS0gYS93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L3Nj
aGVtYV91aV9maWxlcy90YWJsZS51aS5zcGVjLmpzCisrKyBiL3dlYi9yZWdyZXNzaW9uL2phdmFz
Y3JpcHQvc2NoZW1hX3VpX2ZpbGVzL3RhYmxlLnVpLnNwZWMuanMKQEAgLTI3NywxMCArMjc3LDEw
IEBAIGRlc2NyaWJlKCdUYWJsZVNjaGVtYScsICgpPT57CiAgICAgICAgIH0sCiAgICAgICB9KTsK
ICAgICAgIGRlZmVycmVkUHJvbWlzZS50aGVuKChkZXBDaGFuZ2UpPT57Ci0gICAgICAgIGxldCBm
aW5hbENvbHMgPSBbbmV3Q29sLCBuZXdDb2xdOworICAgICAgICBsZXQgZmluYWxDb2xzID0gW25l
d0NvbF07CiAgICAgICAgIGV4cGVjdChkZXBDaGFuZ2Uoc3RhdGUpKS50b0VxdWFsKHsKICAgICAg
ICAgICBhZGRpbmdfaW5oZXJpdF9jb2xzOiBmYWxzZSwKLSAgICAgICAgICBjb2x1bW5zOiBbbmV3
Q29sLCBuZXdDb2xdLAorICAgICAgICAgIGNvbHVtbnM6IFtuZXdDb2xdLAogICAgICAgICB9KTsK
ICAgICAgICAgZXhwZWN0KHNjaGVtYU9iai5jaGFuZ2VDb2x1bW5PcHRpb25zKS50b0hhdmVCZWVu
Q2FsbGVkV2l0aChmaW5hbENvbHMpOwogICAgICAgICBkb25lKCk7Cg==
--0000000000003a6e6805ceb0e7c4--