Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dG2nC-0007Kk-0r for pgadmin-hackers@arkaria.postgresql.org; Wed, 31 May 2017 12:32:02 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1dG2nA-0000Yx-SH for pgadmin-hackers@arkaria.postgresql.org; Wed, 31 May 2017 12:32:00 +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 1dG2nA-0000Yj-1o for pgadmin-hackers@postgresql.org; Wed, 31 May 2017 12:32:00 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1dG2n6-0000En-1a for pgadmin-hackers@postgresql.org; Wed, 31 May 2017 12:31:59 +0000 Received: by mail-wm0-x22e.google.com with SMTP id 123so33503091wmg.1 for ; Wed, 31 May 2017 05:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=iL/otoSmQ5zQI21JTYUmhrYEuzpx3ySY1gHNbeTLwyE=; b=VmMOLYJM4nyXw4LZzUCIHyJNuFJF+bDq6bnnKEamWoaS4Icy+15nNksnegoU7u0I5F S28mi0MGRAEVzgjXNTzTG4KBZ9J7sXl+l3NZeK4p0FABg3p/5+qtE12dHY10vmDy4Xg5 xV2m2tQbNJCJhmNaOf+Twr3w7lhsZooUCHusgisR5nYHsMNZg6mAAs/UeoEAId0AxJfL jv0ZIsd+GFZFlRuG5A6FSmoImCTz5Ds8+Qnk3xTfgXfKNRqvWdhshJpWqsWZLSUDon5v bNHcZt1JKk2fXmaYWbFXcqEerVMw7R57HjV2p2L3CTRw5sg0+o+eje+TWGB22/rpDRNz odzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=iL/otoSmQ5zQI21JTYUmhrYEuzpx3ySY1gHNbeTLwyE=; b=CcBiKlbinQm6eIo9GeeeSvPpisHstn8GswYz44jlU8IpQJ8AMm+m6HkxCwdUl5KDSx UgmfKLnlZMyrjMiFB0KcZdiJKwRupycRVvytC3RmfP07qJRmElI7N4sCnZfz4ZIE+JB4 AB+Oej4VhWlpvuD5KsLDhj2ffljyRkB6NbXEDCBXu61lMSpfN3GTvZ5jmCjc7059QMq2 rF8ZEg1kSSKGAK/ukoy4Hd08OGpAaeuSQb+iPfA0y9LqDJZ0xT/gApsMuf0b+R7KLwey 5OrFt/J7huc+uYkFTRLl0m/eBPAiBCD5+13Xv4qxHzgeBjlx/hM28Cq2iubC/AoNFtOr 6vsw== X-Gm-Message-State: AODbwcAP0AZmD18csOXUkNlbKdvw6Y//N5WEVRCieYIXK+68xqfcNSoc L95WoU3AKyeCukcpAdEDC+L1A/3162Od6ls= X-Received: by 10.223.152.196 with SMTP id w62mr2555942wrb.118.1496233914552; Wed, 31 May 2017 05:31:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.223.161.199 with HTTP; Wed, 31 May 2017 05:31:33 -0700 (PDT) From: Murtuza Zabuawala Date: Wed, 31 May 2017 18:01:33 +0530 Message-ID: Subject: [pgAdmin4][PATCH] To fix the issue in index or exclusion contrarians node To: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a113aa444fa88170550d11aa6" 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 --001a113aa444fa88170550d11aa6 Content-Type: multipart/alternative; boundary="001a113aa444fa88130550d11aa4" --001a113aa444fa88130550d11aa4 Content-Type: text/plain; charset="UTF-8" Hi, PFA patch to fix the issue in index or exclusion contrarians node where it was throwing "can't execute an empty query" error due to incorrect validation logic for edit mode. RM#2113 -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a113aa444fa88130550d11aa4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue in=C2=A0= index or exclusion contrarians node where it was throwing=C2=A0"can= 9;t execute an empty query" error due to incorrect validation logic fo= r edit mode.
RM#2113

--=
Regards,
Murtuza ZabuawalaE= nterpriseDB:=C2=A0http://www.= enterprisedb.com
The Enterprise PostgreSQL Company
--001a113aa444fa88130550d11aa4-- --001a113aa444fa88170550d11aa6 Content-Type: text/plain; charset="US-ASCII"; name="RM_2113.diff" Content-Disposition: attachment; filename="RM_2113.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j3cwku8v0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50 cy9leGNsdXNpb25fY29uc3RyYWludC90ZW1wbGF0ZXMvZXhjbHVzaW9uX2Nv bnN0cmFpbnQvanMvZXhjbHVzaW9uX2NvbnN0cmFpbnQuanMgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFp bnQvdGVtcGxhdGVzL2V4Y2x1c2lvbl9jb25zdHJhaW50L2pzL2V4Y2x1c2lv bl9jb25zdHJhaW50LmpzCmluZGV4IGVlZTlhZDIuLjU5NzJjNTEgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9leGNs dXNpb25fY29uc3RyYWludC90ZW1wbGF0ZXMvZXhjbHVzaW9uX2NvbnN0cmFp bnQvanMvZXhjbHVzaW9uX2NvbnN0cmFpbnQuanMKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2V4Y2x1c2lvbl9jb25zdHJhaW50 L3RlbXBsYXRlcy9leGNsdXNpb25fY29uc3RyYWludC9qcy9leGNsdXNpb25f Y29uc3RyYWludC5qcwpAQCAtMjQsNyArMjQsMjIgQEAgZnVuY3Rpb24oJCwg XywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlmeSkgewogICAgICAg fSx7CiAgICAgICAgIGlkOiAnb3Blcl9jbGFzcycsIGxhYmVsOid7eyBfKCdP cGVyYXRvciBjbGFzcycpIH19JywgdHlwZTondGV4dCcsCiAgICAgICAgIG5v ZGU6ICd0YWJsZScsIHVybDogJ2dldF9vcGVyX2NsYXNzJywgZmlyc3RfZW1w dHk6IHRydWUsCi0gICAgICAgIGVkaXRhYmxlOiB0cnVlLAorICAgICAgICBl ZGl0YWJsZTogZnVuY3Rpb24obSkgeworICAgICAgICAgIGlmIChtIGluc3Rh bmNlb2YgQmFja2JvbmUuQ29sbGVjdGlvbikgeworICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgICAgfSBlbHNlIGlmICgoXy5oYXMobS5jb2xs ZWN0aW9uLCAnaGFuZGxlcicpICYmCisgICAgICAgICAgICAgICAgIV8uaXNV bmRlZmluZWQobS5jb2xsZWN0aW9uLmhhbmRsZXIpICYmCisgICAgICAgICAg ICAgICAgIV8uaXNVbmRlZmluZWQobS5jb2xsZWN0aW9uLmhhbmRsZXIuZ2V0 KCdvaWQnKSkpKSB7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgICAgfSBlbHNlIGlmIChfLmhhcyhtLmNvbGxlY3Rpb24sICdoYW5kbGVy JykgJiYKKyAgICAgICAgICAgICAgICAhXy5pc1VuZGVmaW5lZChtLmNvbGxl Y3Rpb24uaGFuZGxlcikgJiYKKyAgICAgICAgICAgICAgICAhXy5pc1VuZGVm aW5lZChtLmNvbGxlY3Rpb24uaGFuZGxlci5nZXQoJ2FtbmFtZScpKSAmJgor ICAgICAgICAgICAgICAgIG0uY29sbGVjdGlvbi5oYW5kbGVyLmdldCgnYW1u YW1lJykgIT0gJ2J0cmVlJykgeworICAgICAgICAgICAgLy8gRGlzYWJsZSBp ZiBhY2Nlc3MgbWV0aG9kIGlzIG5vdCBidHJlZQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgfSwKICAgICAgICAgc2VsZWN0MjogewogICAgICAgICAg IGFsbG93Q2xlYXI6IHRydWUsIHdpZHRoOiAnc3R5bGUnLCB0YWdzOiB0cnVl LAogICAgICAgICAgIHBsYWNlaG9sZGVyOiAne3sgXygiU2VsZWN0IHRoZSBv cGVyYXRvciBjbGFzcyIpIH19JwpAQCAtNjUsNiArODAsNyBAQCBmdW5jdGlv bigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIEFsZXJ0aWZ5KSB7CiAg ICAgICAgICAgICAgICAgICB1cmw6IGZ1bGxfdXJsLAogICAgICAgICAgICAg ICAgICAgc3VjY2VzczogZnVuY3Rpb24ocmVzKSB7CiAgICAgICAgICAgICAg ICAgICAgIGRhdGEgPSByZXMuZGF0YTsKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5jb2x1bW4uc2V0KCdvcHRpb25zJywgZGF0YSk7CiAgICAgICAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgZXJyb3I6IGZ1bmN0aW9u KCkgewogICAgICAgICAgICAgICAgICAgICBldmVudEhhbmRsZXIudHJpZ2dl cigncGdhZG1pbjp2aWV3OmZldGNoOmVycm9yJywgbSwgc2VsZi5jb2x1bW4p OwpAQCAtNzIsMTggKzg4LDYgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1p biwgcGdCcm93c2VyLCBBbGVydGlmeSkgewogICAgICAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgICAgIGV2ZW50SGFuZGxlci50cmlnZ2VyKCdwZ2Fk bWluOnZpZXc6ZmV0Y2hlZCcsIG0sIHNlbGYuY29sdW1uKTsKICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAvKgotICAgICAgICAgICAgICAgKiBU cmFuc2Zvcm0gdGhlIGRhdGEKLSAgICAgICAgICAgICAgICovCi0gICAgICAg ICAgICAgIHRyYW5zZm9ybSA9IHNlbGYuY29sdW1uLmdldCgndHJhbnNmb3Jt JykgfHwgc2VsZi5kZWZhdWx0cy50cmFuc2Zvcm07Ci0gICAgICAgICAgICAg IGlmICh0cmFuc2Zvcm0gJiYgXy5pc0Z1bmN0aW9uKHRyYW5zZm9ybSkpIHsK LSAgICAgICAgICAgICAgICAvLyBXZSB3aWxsIHRyYW5zZm9ybSB0aGUgZGF0 YSBsYXRlciwgd2hlbiByZW5kZXJpbmcuCi0gICAgICAgICAgICAgICAgLy8g SXQgd2lsbCBhbGxvdyB1cyB0byBnZW5lcmF0ZSBkaWZmZXJlbnQgZGF0YSBi YXNlZCBvbiB0aGUKLSAgICAgICAgICAgICAgICAvLyBkZXBlbmRlbmNpZXMu Ci0gICAgICAgICAgICAgICAgc2VsZi5jb2x1bW4uc2V0KCdvcHRpb25zJywg dHJhbnNmb3JtLmJpbmQoc2VsZiwgZGF0YSkpOwotICAgICAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgICAgIHNlbGYuY29sdW1uLnNldCgnb3B0 aW9ucycsIGRhdGEpOwotICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICBzZWxmLmNvbHVtbi5zZXQoJ29wdGlv bnMnLCBbXSk7CiAgICAgICAgICAgICB9CkBAIC05NCw0OSArOTgsNDIgQEAg ZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlm eSkgewogICAgICAgICBvcHRpb25zOiB7CiAgICAgICAgICAgb25UZXh0OiAn QVNDJywKICAgICAgICAgICBvZmZUZXh0OiAnREVTQycsCi0gICAgICAgIH0s ZWRpdGFibGU6IGZ1bmN0aW9uKG0pIHsKKyAgICAgICAgfSwKKyAgICAgICAg ZWRpdGFibGU6IGZ1bmN0aW9uKG0pIHsKICAgICAgICAgICBpZiAobSBpbnN0 YW5jZW9mIEJhY2tib25lLkNvbGxlY3Rpb24pIHsKICAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgICAgICAgIH0KLSAgICAgICAgICBlbHNlIHsKLSAg ICAgICAgICAgIGlmIChtLnRvcC5nZXQoJ2FtbmFtZScpID09PSAnYnRyZWUn KSB7Ci0gICAgICAgICAgICAgIG0uc2V0KCdpc19zb3J0X251bGxzX2FwcGxp Y2FibGUnLCB0cnVlKTsKLSAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICBtLnNldCgnaXNfc29ydF9udWxs c19hcHBsaWNhYmxlJywgZmFsc2UpOwotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgICAgICAgIH0KLSAgICAgICAgICBpZiAoKF8uaGFzKG0uY29s bGVjdGlvbiwgJ2hhbmRsZXInKSAmJgorICAgICAgICAgIH0gZWxzZSBpZiAo KF8uaGFzKG0uY29sbGVjdGlvbiwgJ2hhbmRsZXInKSAmJgogICAgICAgICAg ICAgICAgICFfLmlzVW5kZWZpbmVkKG0uY29sbGVjdGlvbi5oYW5kbGVyKSAm JgogICAgICAgICAgICAgICAgICFfLmlzVW5kZWZpbmVkKG0uY29sbGVjdGlv bi5oYW5kbGVyLmdldCgnb2lkJykpKSkgewogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgIH0gZWxzZSBpZiAobS50b3AuZ2V0KCdhbW5h bWUnKSA9PT0gJ2J0cmVlJykgeworICAgICAgICAgICAgbS5zZXQoJ2lzX3Nv cnRfbnVsbHNfYXBwbGljYWJsZScsIHRydWUpOworICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIG0u c2V0KCdpc19zb3J0X251bGxzX2FwcGxpY2FibGUnLCBmYWxzZSk7CisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgfQotICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICB9LHsKICAgICAgICAg aWQ6ICdudWxsc19vcmRlcicsIGxhYmVsOid7eyBfKCdOVUxMcyBvcmRlcicp IH19JywgdHlwZToic3dpdGNoIiwKICAgICAgICAgb3B0aW9uczogewogICAg ICAgICAgIG9uVGV4dDogJ0ZJUlNUJywKICAgICAgICAgICBvZmZUZXh0OiAn TEFTVCcsCi0gICAgICAgIH0sZWRpdGFibGU6IGZ1bmN0aW9uKG0pIHsKKyAg ICAgICAgfSwKKyAgICAgICAgZWRpdGFibGU6IGZ1bmN0aW9uKG0pIHsKICAg ICAgICAgICBpZiAobSBpbnN0YW5jZW9mIEJhY2tib25lLkNvbGxlY3Rpb24p IHsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgIH0KLSAg ICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChtLnRvcC5nZXQoJ2Ft bmFtZScpID09PSAnYnRyZWUnKSB7CisgICAgICAgICAgfSBlbHNlIGlmICgo Xy5oYXMobS5jb2xsZWN0aW9uLCAnaGFuZGxlcicpICYmCisgICAgICAgICAg ICAgICAgIV8uaXNVbmRlZmluZWQobS5jb2xsZWN0aW9uLmhhbmRsZXIpICYm CisgICAgICAgICAgICAgICAgIV8uaXNVbmRlZmluZWQobS5jb2xsZWN0aW9u LmhhbmRsZXIuZ2V0KCdvaWQnKSkpKSB7CisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgfSBlbHNlIGlmIChtLnRvcC5nZXQoJ2FtbmFt ZScpID09PSAnYnRyZWUnKSB7CiAgICAgICAgICAgICAgIG0uc2V0KCdpc19z b3J0X251bGxzX2FwcGxpY2FibGUnLCB0cnVlKTsKICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIG0uc2V0KCdpc19zb3J0X251bGxzX2FwcGxpY2Fi bGUnLCBmYWxzZSk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgICAgfQotCi0gICAgICAgICAgaWYgKChfLmhhcyhtLmNvbGxlY3Rpb24s ICdoYW5kbGVyJykgJiYKLSAgICAgICAgICAgICAgICAhXy5pc1VuZGVmaW5l ZChtLmNvbGxlY3Rpb24uaGFuZGxlcikgJiYKLSAgICAgICAgICAgICAgICAh Xy5pc1VuZGVmaW5lZChtLmNvbGxlY3Rpb24uaGFuZGxlci5nZXQoJ29pZCcp KSkpIHsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICB9 Ci0gICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgIH0s ewogICAgICAgICBpZDogJ29wZXJhdG9yJywgbGFiZWw6J3t7IF8oJ09wZXJh dG9yJykgfX0nLCB0eXBlOiAndGV4dCcsCkBAIC0xODQsNiArMTgxLDcgQEAg ZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlm eSkgewogICAgICAgICAgICAgICAgICAgdXJsOiBmdWxsX3VybCwKICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykgewogICAgICAg ICAgICAgICAgICAgICBkYXRhID0gcmVzLmRhdGE7CisgICAgICAgICAgICAg ICAgICAgIHNlbGYuY29sdW1uLnNldCgnb3B0aW9ucycsIGRhdGEpOwogICAg ICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgIGVycm9yOiBm dW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICAgICAgZXZlbnRIYW5kbGVy LnRyaWdnZXIoJ3BnYWRtaW46dmlldzpmZXRjaDplcnJvcicsIG0sIHNlbGYu Y29sdW1uKTsKQEAgLTE5MSwxOCArMTg5LDYgQEAgZnVuY3Rpb24oJCwgXywg UywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlmeSkgewogICAgICAgICAg ICAgICAgIH0pOwogICAgICAgICAgICAgICAgIGV2ZW50SGFuZGxlci50cmln Z2VyKCdwZ2FkbWluOnZpZXc6ZmV0Y2hlZCcsIG0sIHNlbGYuY29sdW1uKTsK ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAvKgotICAgICAgICAg ICAgICAgKiBUcmFuc2Zvcm0gdGhlIGRhdGEKLSAgICAgICAgICAgICAgICov Ci0gICAgICAgICAgICAgIHRyYW5zZm9ybSA9IHNlbGYuY29sdW1uLmdldCgn dHJhbnNmb3JtJykgfHwgc2VsZi5kZWZhdWx0cy50cmFuc2Zvcm07Ci0gICAg ICAgICAgICAgIGlmICh0cmFuc2Zvcm0gJiYgXy5pc0Z1bmN0aW9uKHRyYW5z Zm9ybSkpIHsKLSAgICAgICAgICAgICAgICAvLyBXZSB3aWxsIHRyYW5zZm9y bSB0aGUgZGF0YSBsYXRlciwgd2hlbiByZW5kZXJpbmcuCi0gICAgICAgICAg ICAgICAgLy8gSXQgd2lsbCBhbGxvdyB1cyB0byBnZW5lcmF0ZSBkaWZmZXJl bnQgZGF0YSBiYXNlZCBvbiB0aGUKLSAgICAgICAgICAgICAgICAvLyBkZXBl bmRlbmNpZXMuCi0gICAgICAgICAgICAgICAgc2VsZi5jb2x1bW4uc2V0KCdv cHRpb25zJywgdHJhbnNmb3JtLmJpbmQoc2VsZiwgZGF0YSkpOwotICAgICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHNlbGYuY29sdW1u LnNldCgnb3B0aW9ucycsIGRhdGEpOwotICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgfQogICAgICAgICB9KQpkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2luZGV4ZXMvdGVtcGxhdGVzL2lu ZGV4L2pzL2luZGV4LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2luZGV4 ZXMvdGVtcGxhdGVzL2luZGV4L2pzL2luZGV4LmpzCmluZGV4IDI0OWZiYWYu LmUxOWQwNTQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9p bmRleGVzL3RlbXBsYXRlcy9pbmRleC9qcy9pbmRleC5qcworKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvaW5kZXhlcy90ZW1wbGF0ZXMvaW5kZXgvanMv aW5kZXguanMKQEAgLTg0LDcgKzg0LDkgQEAgZnVuY3Rpb24oJCwgXywgUywg cGdBZG1pbiwgcGdCcm93c2VyLCBCYWNrZm9ybSwgYWxlcnRpZnkpIHsKICAg ICAgICAgICAgIGVkaXRhYmxlOiBmdW5jdGlvbihtKSB7CiAgICAgICAgICAg ICAgICAgLy8gSGVhZGVyIGNlbGwgdGhlbiBza2lwCiAgICAgICAgICAgICAg ICAgaWYgKG0gaW5zdGFuY2VvZiBCYWNrYm9uZS5Db2xsZWN0aW9uKSB7Ci0g ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB9IGVsc2Ug aWYgKG0uaW5TY2hlbWFXaXRoTW9kZWxDaGVjay5hcHBseSh0aGlzLCBhcmd1 bWVudHMpKSB7CisgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJldHVybiAhKG0u Y2hlY2tBY2Nlc3NNZXRob2QuYXBwbHkodGhpcywgYXJndW1lbnRzKSk7CiAg ICAgICAgICAgICB9LApAQCAtMTE0LDEyICsxMTYsMTIgQEAgZnVuY3Rpb24o JCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBCYWNrZm9ybSwgYWxlcnRp ZnkpIHsKICAgICAgICAgICAgICAgLy8gSGVhZGVyIGNlbGwgdGhlbiBza2lw CiAgICAgICAgICAgICAgIGlmIChtIGluc3RhbmNlb2YgQmFja2JvbmUuQ29s bGVjdGlvbikgewogICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGVsc2UgewotICAgICAg ICAgICAgICAgIGlmIChtLnRvcC5nZXQoJ2FtbmFtZScpID09PSAnYnRyZWUn KSB7Ci0gICAgICAgICAgICAgICAgICBtLnNldCgnaXNfc29ydF9udWxsc19h cHBsaWNhYmxlJywgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIH0gZWxz ZSBpZiAobS5pblNjaGVtYVdpdGhNb2RlbENoZWNrLmFwcGx5KHRoaXMsIGFy Z3VtZW50cykpIHsKKyAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgICAgICAgfSBlbHNlIGlmIChtLnRvcC5nZXQoJ2FtbmFtZScp ID09PSAnYnRyZWUnKSB7CisgICAgICAgICAgICAgICAgbS5zZXQoJ2lzX3Nv cnRfbnVsbHNfYXBwbGljYWJsZScsIHRydWUpOworICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgICAgIG0uc2V0KCdpc19zb3J0X251bGxzX2FwcGxpY2FibGUnLCBm YWxzZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAg ICAgICAgICB9CkBAIC0xMzYsMTQgKzEzOCwxNSBAQCBmdW5jdGlvbigkLCBf LCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIEJhY2tmb3JtLCBhbGVydGlmeSkg ewogICAgICAgICAgICAgZWRpdGFibGU6IGZ1bmN0aW9uKG0pIHsKICAgICAg ICAgICAgICAgLy8gSGVhZGVyIGNlbGwgdGhlbiBza2lwCiAgICAgICAgICAg ICAgIGlmIChtIGluc3RhbmNlb2YgQmFja2JvbmUuQ29sbGVjdGlvbikgewot ICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICBpZiAobS50b3AuZ2V0KCdh bW5hbWUnKSA9PT0gJ2J0cmVlJykgewotICAgICAgICAgICAgICAgICAgICBt LnNldCgnaXNfc29ydF9udWxsc19hcHBsaWNhYmxlJywgdHJ1ZSk7Ci0gICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgICAgbS5zZXQoJ2lzX3NvcnRfbnVsbHNf YXBwbGljYWJsZScsIGZhbHNlKTsKICAgICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgICAgICAgfSBlbHNlIGlmIChtLmluU2NoZW1h V2l0aE1vZGVsQ2hlY2suYXBwbHkodGhpcywgYXJndW1lbnRzKSkgeworICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICB9 IGVsc2UgaWYgKG0udG9wLmdldCgnYW1uYW1lJykgPT09ICdidHJlZScpIHsK KyAgICAgICAgICAgICAgICBtLnNldCgnaXNfc29ydF9udWxsc19hcHBsaWNh YmxlJywgdHJ1ZSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgbS5zZXQo J2lzX3NvcnRfbnVsbHNfYXBwbGljYWJsZScsIGZhbHNlKTsKKyAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0sCiAgICAgICAgICAgICBkZXBzOiBbJ2FtbmFtZScsICdzb3J0 X29yZGVyJ10sCkBAIC0xODcsMTEgKzE5MCwxMCBAQCBmdW5jdGlvbigkLCBf LCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIEJhY2tmb3JtLCBhbGVydGlmeSkg ewogICAgICAgICBjaGVja0FjY2Vzc01ldGhvZDogZnVuY3Rpb24obSkgewog ICAgICAgICAvL0FjY2VzcyBtZXRob2QgaXMgZW1wdHkgb3IgYnRyZWUgdGhl biBkbyBub3QgZGlzYWJsZSBmaWVsZAogICAgICAgICAgIHZhciBwYXJlbnRf bW9kZWwgPSBtLnRvcDsKLSAgICAgICAgICBpZighbS5pblNjaGVtYVdpdGhN b2RlbENoZWNrLmFwcGx5KHRoaXMsIFttXSkgJiYKLSAgICAgICAgICAgICAg KF8uaXNVbmRlZmluZWQocGFyZW50X21vZGVsLmdldCgnYW1uYW1lJykpIHx8 CisgICAgICAgICAgaWYoXy5pc1VuZGVmaW5lZChwYXJlbnRfbW9kZWwuZ2V0 KCdhbW5hbWUnKSkgfHwKICAgICAgICAgICAgICAgIF8uaXNOdWxsKHBhcmVu dF9tb2RlbC5nZXQoJ2FtbmFtZScpKSB8fAogICAgICAgICAgICAgICAgU3Ry aW5nKHBhcmVudF9tb2RlbC5nZXQoJ2FtbmFtZScpKS5yZXBsYWNlKC9eXHMr fFxzKyQvZywgJycpID09ICcnIHx8Ci0gICAgICAgICAgICAgICBwYXJlbnRf bW9kZWwuZ2V0KCdhbW5hbWUnKSA9PT0gJ2J0cmVlJykpIHsKKyAgICAgICAg ICAgICAgIHBhcmVudF9tb2RlbC5nZXQoJ2FtbmFtZScpID09PSAnYnRyZWUn KSB7CiAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHNldCBudWxscyB0byB0 cnVlIGlmIHNvcnRfb3JkZXIgaXMgc2V0IHRvIGRlc2MKICAgICAgICAgICAg IC8vIG51bGxzIGZpcnN0IGlzIGRlZmF1bHQgZm9yIGRlc2MKICAgICAgICAg ICAgIGlmKG0uZ2V0KCdzb3J0X29yZGVyJykgPT0gdHJ1ZSAmJiBtLnByZXZp b3VzKCdzb3J0X29yZGVyJykgPT0gIGZhbHNlKSB7CkBAIC0yMDIsNyArMjA0 LDcgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBC YWNrZm9ybSwgYWxlcnRpZnkpIHsKICAgICAgICAgICAgIG0uc2V0KCdpc19z b3J0X251bGxzX2FwcGxpY2FibGUnLCBmYWxzZSk7CiAgICAgICAgICAgfQog ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfSwKKyAgICAgICAg fQogICAgIH0pOwogCiAgIGlmICghcGdCcm93c2VyLk5vZGVzWydpbmRleCdd KSB7Cg== --001a113aa444fa88170550d11aa6 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 --001a113aa444fa88170550d11aa6--