Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSM0o-0007DI-ON for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 10:24:26 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bSM0o-0001d8-Ay for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 10:24:26 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bSM0m-0001cK-Pr for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 10:24:24 +0000 Received: from mail-oi0-x234.google.com ([2607:f8b0:4003:c06::234]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bSM0i-0004fU-L8 for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 10:24:24 +0000 Received: by mail-oi0-x234.google.com with SMTP id l65so11102948oib.1 for ; Wed, 27 Jul 2016 03:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=0qdRfOKmwkKnThNAKXEGvAkr7smaKHV+cc8tIh5btdI=; b=Hz5H7PwoZPRD/J0XbS+MTM1MMbl478prj5vHqUbQhnNcta9lJravu4TKXEJhL+IO1u zmWbjPy2/yKuaG+FEfjrzknKAdnYYp/N51jO4MK2ZBOSRWvL3i7PJzqW6e3zF/o1HIMt TeIOjaWDTGoUkdkypmEE52E9aMaTJgcA+9Cc710LfmKBW60yUk6y2t+GyS29sCMZGo0w pbUc1gFHK0MXadsm8aP1jYYHE+aAQ1HFSO/gtboBcyuHptPQ4jF4g9bCjkZbmpi3yLkC sSzPbjkaA+S6ywSV5PqDQ6cUlh8wPmCFJyBxQv89f/RluzPS21FBPrho9yHo95dPJkc3 IryA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=0qdRfOKmwkKnThNAKXEGvAkr7smaKHV+cc8tIh5btdI=; b=lnWnMjYv+v2JNKdqi9UEEO+mgqT34B8edXTHfHSzkpeG+I5Z/8PpX3CL7ywB4hBTRW LWbsvx1KJ+mqv7iJBD6toGT/vl+0Sp9wqj0+Wz7zvIQSGqoWPUHGy3XVz7tI7k1FllIN cZk8cL6nvFn7URtYX1O7Q7zAnu4E1epk0PWAH0AzpaDcsGAVKloPAYkbUN4qasQ3FNiy pP88z1jzW6s9IiVaMvnA4RcNLcmOTTS2Xo+oTH6VbnOcArCiXF2Uo1BSHIzv8aVbM+vW SU6RalRnnCA8S6ERq2Trz0IcVnEklbKkBoV4mDQ4tfkxDauKHjSFr0BodPMu1GdxiBjf laJg== X-Gm-Message-State: AEkoouvy+EtKIY/hh66rEETZdTAvEuwpxOjM3UhzYi9OZjrDFMfg/kdF9twKI2MfujwAiGa9HKVWwtVAjpDVLibG X-Received: by 10.157.19.39 with SMTP id f36mr14864009ote.53.1469615055074; Wed, 27 Jul 2016 03:24:15 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.5.99 with HTTP; Wed, 27 Jul 2016 03:24:14 -0700 (PDT) In-Reply-To: References: From: Harshal Dhumal Date: Wed, 27 Jul 2016 15:54:14 +0530 Message-ID: Subject: Re: patch for issue RM1260 [pgAdmin4] To: Ashesh Vashi Cc: Dave Page , pgadmin-hackers Content-Type: multipart/mixed; boundary=001a113cfd8a50a70f05389b6b86 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a113cfd8a50a70f05389b6b86 Content-Type: multipart/alternative; boundary=001a113cfd8a50a70a05389b6b84 --001a113cfd8a50a70a05389b6b84 Content-Type: text/plain; charset=UTF-8 and patch file -- *Harshal Dhumal* *Software Engineer* EnterpriseDB India: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Wed, Jul 27, 2016 at 3:49 PM, Harshal Dhumal < harshal.dhumal@enterprisedb.com> wrote: > Hi, > > PFA updated patch for RM1260. > > In addition to RM1260 issue I have added following changes in this patch. > 1] datamodel.js: Added option check against undefined. > 2] foreign key: fixed first empty option issue. > > -- > *Harshal Dhumal* > *Software Engineer* > > EnterpriseDB India: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > > On Thu, Jul 7, 2016 at 5:08 PM, Ashesh Vashi < > ashesh.vashi@enterprisedb.com> wrote: > >> Sure - I will do. >> >> -- >> >> Thanks & Regards, >> >> Ashesh Vashi >> EnterpriseDB INDIA: Enterprise PostgreSQL Company >> >> >> >> *http://www.linkedin.com/in/asheshvashi* >> >> >> On Thu, Jul 7, 2016 at 2:33 PM, Dave Page wrote: >> >>> Ashesh, can you review/commit please? >>> >>> Thanks. >>> >>> On Thu, Jul 7, 2016 at 7:50 AM, Harshal Dhumal < >>> harshal.dhumal@enterprisedb.com> wrote: >>> >>>> Hi, >>>> >>>> By mistake I deleted a line which was not supposed to be deleted, and >>>> that line of code was initialization of select2. >>>> >>>> -- >>>> *Harshal Dhumal* >>>> *Software Engineer* >>>> >>>> EnterpriseDB India: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>>> >>>> On Thu, Jul 7, 2016 at 12:13 PM, Ashesh Vashi < >>>> ashesh.vashi@enterprisedb.com> wrote: >>>> >>>>> Hi Harshal, >>>>> >>>>> Can you please explain - what was missing in the last patch? >>>>> >>>>> -- >>>>> >>>>> Thanks & Regards, >>>>> >>>>> Ashesh Vashi >>>>> EnterpriseDB INDIA: Enterprise PostgreSQL Company >>>>> >>>>> >>>>> >>>>> *http://www.linkedin.com/in/asheshvashi* >>>>> >>>>> >>>>> On Thu, Jul 7, 2016 at 12:12 PM, Harshal Dhumal < >>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>> >>>>>> Hi, >>>>>> >>>>>> PFA updated patch for issue RM1260 >>>>>> >>>>>> -- >>>>>> *Harshal Dhumal* >>>>>> *Software Engineer* >>>>>> >>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>> The Enterprise PostgreSQL Company >>>>>> >>>>>> On Thu, Jul 7, 2016 at 12:04 PM, Harshal Dhumal < >>>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi, >>>>>>> Please ignore this patch as this has some minor issue. I'll sent >>>>>>> updated one. >>>>>>> >>>>>>> -- >>>>>>> *Harshal Dhumal* >>>>>>> *Software Engineer* >>>>>>> >>>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>>> The Enterprise PostgreSQL Company >>>>>>> >>>>>>> On Wed, Jul 6, 2016 at 5:30 PM, Harshal Dhumal < >>>>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>>>> >>>>>>>> Hi, >>>>>>>> >>>>>>>> PFA patch for issue RM1260. >>>>>>>> >>>>>>>> Changes: Issue wasn't related to foreign table but was due the >>>>>>>> Select2 control. Now I have improved select2 control to handle null value >>>>>>>> in multi-select mode. Initial it was returning "null" instead it should >>>>>>>> return [] (empty array). >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> *Harshal Dhumal* >>>>>>>> *Software Engineer* >>>>>>>> >>>>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>>>> The Enterprise PostgreSQL Company >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org >>>>>> ) >>>>>> To make changes to your subscription: >>>>>> http://www.postgresql.org/mailpref/pgadmin-hackers >>>>>> >>>>>> >>>>> >>>> >>> >>> >>> -- >>> Dave Page >>> Blog: http://pgsnake.blogspot.com >>> Twitter: @pgsnake >>> >>> EnterpriseDB UK: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> >> > --001a113cfd8a50a70a05389b6b84 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
and patch file

--=C2=A0
Harshal Dhumal
Software Engineer
=
EnterpriseDB India:=C2=A0http://w= ww.enterprisedb.com
The Enterprise Po= stgreSQL Company
=

On Wed, Jul 27, 2016 at 3:49 PM, Harshal Dhu= mal <harshal.dhumal@enterprisedb.com> wrote:
Hi,
PFA updated patch for RM1260.

In addition to RM126= 0 issue I have added following changes in this patch.
1] datamodel= .js: Added option check against undefined.
2] foreign key: fixed f= irst empty option issue.

=
--=C2=A0
Hars= hal Dhumal
Software Engineer

EnterpriseDB= India:=C2=A0http://www.enterprisedb= .com
The Enterprise PostgreSQL Comp= any
<= /div>

On Thu, Jul 7,= 2016 at 5:08 PM, Ashesh Vashi <ashesh.vashi@enterprisedb.com<= /a>> wrote:
Su= re - I will do.

--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Co= mpany

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Thu, Jul 7, 2016 at 2:33= PM, Dave Page <dpage@pgadmin.org> wrote:
Ashesh, can you review/commit please?
=
Thanks.

=
On Thu, Jul 7, 2016 at 7:50 AM, Harshal Dhumal <= span dir=3D"ltr"><harshal.dhumal@enterprisedb.com> wrote:
Hi,

By mista= ke I deleted a line which was not supposed to be deleted, and that line of = code was initialization of select2.

=
--=C2=A0
Hars= hal Dhumal
Software Engineer

EnterpriseDB= India:=C2=A0http://www.enterprisedb= .com
The Enterprise PostgreSQL Comp= any
<= /div>

On Thu, Jul 7, 2016 at 12:1= 3 PM, Ashesh Vashi <ashesh.vashi@enterprisedb.com> wrote:
Hi Harshal,
Can you please explain - what was missing in the last patc= h?

--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Thu, Jul 7, 2016 at 12:12 PM, H= arshal Dhumal <harshal.dhumal@enterprisedb.com> wrote:
Hi,

PFA updated patch for issue RM1260
=

=
--=C2=A0
Harshal Dhumal
Software Enginee= r

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
T= he Enterprise PostgreSQL Company

On Thu, Jul 7, 2016 at 12:04 PM= , Harshal Dhumal <harshal.dhumal@enterprisedb.com> wrote:
Hi,
Plea= se ignore this patch as this has some minor issue. I'll sent updated on= e.

<= div>
--=C2=A0
Harshal Dhumal
Soft= ware Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company

On Wed, Jul 6, 2016 at 5:30= PM, Harshal Dhumal <harshal.dhumal@enterprisedb.com>= wrote:
Hi,

PFA patch for issue RM1260.

Changes: Issue w= asn't related to foreign table but was due the Select2 control. Now I h= ave improved select2 control to handle null value in multi-select mode. Ini= tial it was returning "null" instead it should return [] (empty a= rray).


--=C2=A0
Harshal Dhumal
=
Software Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company




--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers=






<= font color=3D"#888888">--
Dave = Page
Blog: htt= p://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: <= a href=3D"http://www.enterprisedb.com" target=3D"_blank">http://www.enterpr= isedb.com
The Enterprise PostgreSQL Company


--001a113cfd8a50a70a05389b6b84-- --001a113cfd8a50a70f05389b6b86 Content-Type: text/x-patch; charset=US-ASCII; name="RM1260_V3.patch" Content-Disposition: attachment; filename="RM1260_V3.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ir4quul30 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3Rl bXBsYXRlcy9mb3JlaWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3Jl aWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcwppbmRleCBhNGI1YTI3 Li4zYWY2YzYxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWdu X3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvanMvZm9yZWlnbl90 YWJsZXMuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMv dGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL2pzL2ZvcmVpZ25fdGFibGVzLmpz CkBAIC0yNjYsMTIgKzI2Niw2IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRt aW4sIHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKICAgKi8KIAogICB2YXIgTm9k ZUFqYXhPcHRpb25zTXVsdGlwbGVDb250cm9sID0gQmFja2Zvcm0uTm9kZUFq YXhPcHRpb25zTXVsdGlwbGVDb250cm9sID0gQmFja2Zvcm0uTm9kZUFqYXhP cHRpb25zQ29udHJvbC5leHRlbmQoewotICAgIHRlbXBsYXRlOiBfLnRlbXBs YXRlKFsKLSAgICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRy b2xMYWJlbENsYXNzTmFtZSU+Ij48JT1sYWJlbCU+PC9sYWJlbD4nLAotICAg ICAgJzxkaXYgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xzQ2xhc3NOYW1l JT4gPCU9ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iPicsCi0gICAgICAn ICA8c2VsZWN0IGNsYXNzPSJwZ2FkbWluLW5vZGUtc2VsZWN0IGZvcm0tY29u dHJvbCIgbmFtZT0iPCU9bmFtZSU+IiBzdHlsZT0id2lkdGg6MTAwJTsiIHZh bHVlPTwlLXZhbHVlJT4gPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIl PiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAiIiU+ID4nLAotICAgICAg JyAgPC9zZWxlY3Q+JywKLSAgICAgICc8L2Rpdj4nXS5qb2luKCJcbiIpKSwK ICAgICBkZWZhdWx0czogXy5leHRlbmQoCiAgICAgICB7fSwgQmFja2Zvcm0u Tm9kZUFqYXhPcHRpb25zQ29udHJvbC5wcm90b3R5cGUuZGVmYXVsdHMsCiAg ICAgICB7CkBAIC0zMzUsNyArMzI5LDcgQEAgZnVuY3Rpb24oJCwgXywgUywg cGdBZG1pbiwgcGdCcm93c2VyLCBhbGVydGlmeSkgewogICAgICAgICAgIHsK ICAgICAgICAgICAgICdkYXRhJzogZGF0YS5vcHRpb25zCiAgICAgICAgICAg fSk7Ci0gICAgICAgIHRoaXMuJGVsLmZpbmQoInNlbGVjdCIpLnNlbGVjdDIo b3B0cykudmFsKGRhdGEucmF3VmFsdWUpLnRyaWdnZXIoImNoYW5nZSIpOwor ICAgICAgICB0aGlzLiRlbC5maW5kKCJzZWxlY3QiKS5zZWxlY3QyKG9wdHMp OwogICAgICAgICB0aGlzLnVwZGF0ZUludmFsaWQoKTsKICAgICAgICAgfQog ICAgICAgfQpAQCAtMzcwLDcgKzM2NCw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMs IHBnQWRtaW4sIHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKIAogICAgICAgLy8g UmVtb3ZlIENvbHVtbnMgaWYgaW5oZXJpdCBvcHRpb24gaXMgZGVzZWxlY3Rl ZCBmcm9tIHRoZSBjb21ib2JveAogICAgICAgaWYoXy5zaXplKHZhbHVlKSA8 IF8uc2l6ZShpbmhlcml0cykpIHsKLSAgICAgICAgdmFyIGRpZiA9ICBfLmRp ZmZlcmVuY2UoaW5oZXJpdHMsIEpTT04ucGFyc2UodmFsdWUpKTsKKyAgICAg ICAgdmFyIGRpZiA9ICBfLmRpZmZlcmVuY2UoaW5oZXJpdHMsIHZhbHVlKTsK ICAgICAgICAgdmFyIHJtdl9jb2x1bW5zID0gY29sdW1ucy53aGVyZSh7aW5o ZXJpdGVkaWQ6IHBhcnNlSW50KGRpZlswXSl9KTsKICAgICAgICAgY29sdW1u cy5yZW1vdmUocm12X2NvbHVtbnMpOwogICAgICAgfQpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVp Z25fdGFibGVzL3NxbC85LjVfcGx1cy9nZXRfdGFibGVzLnNxbCBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3JlaWduX3Rh Ymxlcy9zcWwvOS41X3BsdXMvZ2V0X3RhYmxlcy5zcWwKaW5kZXggODM0NDVh Mi4uMWJiNTAxZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWln bl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85LjVfcGx1 cy9nZXRfdGFibGVzLnNxbAorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWdu X3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3FsLzkuNV9wbHVz L2dldF90YWJsZXMuc3FsCkBAIC05LDcgKzksNyBAQCBXSEVSRQogCiB7JSBl bHNlICV9CiBTRUxFQ1QKLSAgICBjLm9pZCBBUyBpZCwgcXVvdGVfaWRlbnQo bi5uc3BuYW1lKSB8fCAnLicgfHwgcXVvdGVfaWRlbnQoYy5yZWxuYW1lKSBh cyB0ZXh0CisgICAgYy5vaWQgQVMgdmFsdWUsIHF1b3RlX2lkZW50KG4ubnNw bmFtZSkgfHwgJy4nIHx8IHF1b3RlX2lkZW50KGMucmVsbmFtZSkgYXMgbGFi ZWwKIEZST00KICAgICBwZ19jbGFzcyBjLCBwZ19uYW1lc3BhY2UgbgogV0hF UkUKQEAgLTE5LDQgKzE5LDQgQEAgV0hFUkUKIHslIGVuZGlmICV9CiBPUkRF UiBCWQogICAgIG4ubnNwbmFtZSwgYy5yZWxuYW1lOwoteyUgZW5kaWYgJX0K K3slIGVuZGlmICV9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2Zv cmVpZ25fa2V5L3RlbXBsYXRlcy9mb3JlaWduX2tleS9qcy9mb3JlaWduX2tl eS5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3Jl aWduX2tleS90ZW1wbGF0ZXMvZm9yZWlnbl9rZXkvanMvZm9yZWlnbl9rZXku anMKaW5kZXggM2ZmYTZlZi4uZDdjOTQ3ZiAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5L3RlbXBs YXRlcy9mb3JlaWduX2tleS9qcy9mb3JlaWduX2tleS5qcworKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZm9yZWlnbl9rZXkvdGVt cGxhdGVzL2ZvcmVpZ25fa2V5L2pzL2ZvcmVpZ25fa2V5LmpzCkBAIC0yMSw2 ICsyMSw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIHBnQnJvd3Nl ciwgQWxlcnRpZnkpIHsKICAgICAgIGhlYWRlclNlbGVjdENvbnRyb2xUZW1w bGF0ZSA9ICBfLnRlbXBsYXRlKFsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sc0NsYXNz TmFtZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+Ij4nLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJyAgPHNlbGVjdCBjbGFzcz0i cGdhZG1pbi1ub2RlLXNlbGVjdCBmb3JtLWNvbnRyb2wiIG5hbWU9IjwlPW5h bWUlPiIgc3R5bGU9IndpZHRoOjEwMCU7IiB2YWx1ZT0iPCUtdmFsdWUlPiIg PCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIlPiA8JT1yZXF1aXJlZCA/ ICJyZXF1aXJlZCIgOiAiIiU+ID4nLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJyAgICA8JT1zZWxlY3QyLmZpcnN0X2VtcHR5ID8gIiA8b3B0 aW9uPjwvb3B0aW9uPiIgOiAiIiU+JywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICcgICAgPCUgZm9yICh2YXIgaT0wOyBpIDwgb3B0aW9ucy5s ZW5ndGg7IGkrKykgeyAlPicsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnICAgIDwlIHZhciBvcHRpb24gPSBvcHRpb25zW2ldOyAlPicsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnICAgIDxvcHRpb24gPCUg aWYgKG9wdGlvbi5pbWFnZSkgeyAlPiBkYXRhLWltYWdlPTwlPSBvcHRpb24u aW1hZ2UgJT4gPCUgfSAlPiB2YWx1ZT08JT0gZm9ybWF0dGVyLmZyb21SYXco b3B0aW9uLnZhbHVlKSAlPiA8JT1vcHRpb24udmFsdWUgPT09IHJhd1ZhbHVl ID8gInNlbGVjdGVkPVwnc2VsZWN0ZWRcJyIgOiAiIiAlPj48JS1vcHRpb24u bGFiZWwlPjwvb3B0aW9uPicsCkBAIC0xMzQsOCArMTM1LDkgQEAgZnVuY3Rp b24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlmeSkgewog ICAgICAgICAgIH0pLAogICAgICAgICAgIHNlbGVjdDI6IHsKICAgICAgICAg ICAgIGFsbG93Q2xlYXI6IGZhbHNlLCB3aWR0aDogJ3N0eWxlJywKLSAgICAg ICAgICAgIHBsYWNlaG9sZGVyOiAnU2VsZWN0IGNvbHVtbicKLSAgICAgICAg ICB9LCBmaXJzdF9lbXB0eTogIV8uaXNVbmRlZmluZWQoc2VsZi5tb2RlbC5n ZXQoJ29pZCcpKSwKKyAgICAgICAgICAgIHBsYWNlaG9sZGVyOiAne3sgXygn U2VsZWN0IGNvbHVtbicpIH19JywKKyAgICAgICAgICAgIGZpcnN0X2VtcHR5 OiAhXy5pc1VuZGVmaW5lZChzZWxmLm1vZGVsLmdldCgnb2lkJykpCisgICAg ICAgICAgfSwKICAgICAgICAgICB2ZXJzaW9uX2NvbXBhdGlibGU6IHNlbGYu ZmllbGQuZ2V0KCd2ZXJzaW9uX2NvbXBhdGlibGUnKSwKICAgICAgICAgICBk aXNhYmxlZDogZnVuY3Rpb24obSkgewogICAgICAgICAgICAgcmV0dXJuICFf LmlzVW5kZWZpbmVkKHNlbGYubW9kZWwuZ2V0KCdvaWQnKSk7CkBAIC0yMzQs MTAgKzIzNiwxMSBAQCBmdW5jdGlvbigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jy b3dzZXIsIEFsZXJ0aWZ5KSB7CiAgICAgICAgICAgICAgIEJhY2tmb3JtLlNl bGVjdDJDb250cm9sLnByb3RvdHlwZS5yZW5kZXIuYXBwbHkodGhpcywgYXJn dW1lbnRzKTsKICAgICAgICAgICAgICAgcmV0dXJuIHRoaXM7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgfSksIHVybDogJ2dldF9jb2x1bW5zJywgZmly c3RfZW1wdHk6IHRydWUsCisgICAgICAgICAgfSksIHVybDogJ2dldF9jb2x1 bW5zJywKICAgICAgICAgICBzZWxlY3QyOiB7CisgICAgICAgICAgICBhbGxv d0NsZWFyOiBmYWxzZSwKICAgICAgICAgICAgIHdpZHRoOiAic3R5bGUiLAot ICAgICAgICAgICAgcGxhY2Vob2xkZXI6ICdTZWxlY3QgY29sdW1uJywKKyAg ICAgICAgICAgIHBsYWNlaG9sZGVyOiAne3sgXygnU2VsZWN0IGNvbHVtbicp IH19JywKICAgICAgICAgICAgIHRlbXBsYXRlUmVzdWx0OiBmb3JtYXROb2Rl LAogICAgICAgICAgICAgdGVtcGxhdGVTZWxlY3Rpb246IGZvcm1hdE5vZGUK ICAgICAgICAgICB9LApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zdGF0aWMvanMvZGF0YW1vZGVsLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zdGF0aWMvanMvZGF0YW1vZGVsLmpzCmluZGV4IDhjYjcwMzQuLjdiMzc5 Y2UgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pz L2RhdGFtb2RlbC5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRp Yy9qcy9kYXRhbW9kZWwuanMKQEAgLTEyNCw3ICsxMjQsNyBAQCBmdW5jdGlv bihfLCBwZ0FkbWluLCAkLCBCYWNrYm9uZSkgewogICAgICAgICB2YXIgc2Vs ZiA9IHRoaXM7CiAgICAgICAgIHNlbGYuX3ByZXZpb3VzX2tleV92YWx1ZXMg PSB7fTsKIAotICAgICAgICBpZiAoJ29uX3NlcnZlcicgaW4gb3B0aW9ucyAm JiBvcHRpb25zLm9uX3NlcnZlcikgeworICAgICAgICBpZiAoIV8uaXNVbmRl ZmluZWQob3B0aW9ucykgJiYgJ29uX3NlcnZlcicgaW4gb3B0aW9ucyAmJiBv cHRpb25zLm9uX3NlcnZlcikgewogICAgICAgICAgIHNlbGYub25fc2VydmVy ID0gdHJ1ZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5qcyBiL3dlYi9wZ2FkbWlu L3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzCmluZGV4IDI1MzBkYjku LmUyN2VhMmQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9i YWNrZm9ybS5wZ2FkbWluLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9q cy9iYWNrZm9ybS5wZ2FkbWluLmpzCkBAIC0xODA0LDcgKzE4MDQsMTEgQEAK ICAgICAgIGlmIChfLmlzQXJyYXkoZm9ybWF0dGVkRGF0YSkpIHsKICAgICAg ICAgcmV0dXJuIF8ubWFwKGZvcm1hdHRlZERhdGEsIGRlY29kZVVSSUNvbXBv bmVudCk7CiAgICAgICB9IGVsc2UgewotICAgICAgICByZXR1cm4gZGVjb2Rl VVJJQ29tcG9uZW50KGZvcm1hdHRlZERhdGEpOworICAgICAgICBpZighXy5p c051bGwoZm9ybWF0dGVkRGF0YSkgJiYgIV8uaXNVbmRlZmluZWQoZm9ybWF0 dGVkRGF0YSkpIHsKKyAgICAgICAgICByZXR1cm4gZGVjb2RlVVJJQ29tcG9u ZW50KGZvcm1hdHRlZERhdGEpOworICAgICAgICB9IGVsc2UgeworICAgICAg ICAgIHJldHVybiBudWxsOworICAgICAgICB9CiAgICAgICB9CiAgICAgfQog ICB9KTsKQEAgLTE5MTUsOSArMTkxOSwxNSBAQAogICAgICAgcmV0dXJuIHRo aXM7CiAgICAgfSwKICAgICBnZXRWYWx1ZUZyb21ET006IGZ1bmN0aW9uKCkg ewotICAgICAgcmV0dXJuIEJhY2tmb3JtLlNlbGVjdENvbnRyb2wucHJvdG90 eXBlLmdldFZhbHVlRnJvbURPTS5hcHBseSgKLSAgICAgICAgdGhpcywgYXJn dW1lbnRzCi0gICAgICApOworICAgICAgdmFyIHZhbCA9IEJhY2tmb3JtLlNl bGVjdENvbnRyb2wucHJvdG90eXBlLmdldFZhbHVlRnJvbURPTS5hcHBseSgK KyAgICAgICAgICAgICAgICAgIHRoaXMsIGFyZ3VtZW50cworICAgICAgICAg ICAgICAgICksCisgICAgICAgIHNlbGVjdDJPcHRzID0gXy5leHRlbmQoe30s IHRoaXMuZmllbGQuZ2V0KCJzZWxlY3QyIikgfHwgdGhpcy5kZWZhdWx0cy5z ZWxlY3QyKTsKKworICAgICAgaWYgKHNlbGVjdDJPcHRzLm11bHRpcGxlICYm IHZhbCA9PSBudWxsKSB7CisgICAgICAgIHJldHVybiBbXTsKKyAgICAgIH0K KyAgICAgIHJldHVybiB2YWw7CiAgICAgfQogICB9KTsKIAo= --001a113cfd8a50a70f05389b6b86 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --001a113cfd8a50a70f05389b6b86--