Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l27rU-0006Yh-5Z for pgadmin-hackers@arkaria.postgresql.org; Wed, 20 Jan 2021 07:25:04 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1l27rT-0004PX-3n for pgadmin-hackers@arkaria.postgresql.org; Wed, 20 Jan 2021 07:25:03 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l27rS-0004PO-T8 for pgadmin-hackers@lists.postgresql.org; Wed, 20 Jan 2021 07:25:02 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1l27rQ-0006cg-36 for pgadmin-hackers@postgresql.org; Wed, 20 Jan 2021 07:25:02 +0000 Received: by mail-lj1-x22f.google.com with SMTP id f11so24874966ljm.8 for ; Tue, 19 Jan 2021 23:24:59 -0800 (PST) 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=Hz7eGCjNSrJwayjU8Z/gY8izLTH9CFec6pNVTTIgcE4=; b=aKKqdrXguwJRnS0Fj6UCZQgPm66chkq7mM9xO/HK54yf5BHWoOvC9B6kj/RjiXIy2X tr1Ew+cJStsgD80dcUTE8NdfnHQLON+ww+roeDf1YFYpJdA/3K9mspdDtASjpR6Zoasd j1O3OaZg32MFI3eHoPeQQp1rG9CQOv6szlLBGcDUxd0L/ckAiK8ulAk20ICteDjWoeoo FSpWVbbjkXtELFaPHb4VUIzl1TG0icNm4JCEamC/okvOX+y1H/pODstwJbSibeAmCtbQ Zc9+b36mMGO/ni2GcSthFX/IkR9cDbqyeglsZD8ZY7LvwFohNRk4v+GRx3gi0I7tCOxS 6/yw== 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=Hz7eGCjNSrJwayjU8Z/gY8izLTH9CFec6pNVTTIgcE4=; b=FbDt6ZP8ppCg6xYMpJ8+ki5eeMLRC7tz2A6ABk3B+4aNXfXZl9KtwJZgbwU01/mPoY mg8v0IFH9cIJyEJlk0UDbSaCGr/pkvG2tPRtbZcw7OvLIE02xsNF15KCBAi6R33rCzNo auM+IYdjMJbwV5G8izmGAz+QHcNv/jkRr+dl/RJPZCPZDFeIUoaVxw9LBOAT5DpyFxUa EMmmSSa1shTwtBiZzocnR3pnhL21tyKQY7qqCwqFte+By1ceK4WVOjcb/TKNqNXEgx+x L3LNNn56LR+4Ax9c+6EgvQAsQr7dPbdmjDWBVqeepRM8wQbIR4LT0KTOjllUL83sGL1Y 4Rxw== X-Gm-Message-State: AOAM532K8Ci2L0v3OwQOzNfPmGabCtxElgTeePq8ogfv2ZOcwdnke/0c CAig5MT6XQnNfuBHENhgeyTPgfw7PBuychuVshJ7fUzDwaO1MKCzXsi+ZGmDnJkH4n5hfGX9pMF 0PBiyW4/GWpAZIXquq7tnHLO2DuI3uc3GeUkT8lzc4JBXJ+J4HvfE1BZ+t7Xm7VIG7R1byzjc4L GFDU3wocxJl1+9kWNIuwkZrdbZbBWCJfp8xnZ9qfxm5n1LXWSGrUmetjFSU2DYXZ6cm7Vf X-Google-Smtp-Source: ABdhPJw1ZWhWWrQl0VeDEM2dQnAj5zn/pF8n2Cyxl1Qw0yYwTYW4RfQGUtogz2Ddgep7UQkI8tlnU1yOVGmMEgax6Tc= X-Received: by 2002:a2e:9f4e:: with SMTP id v14mr1814717ljk.73.1611127498370; Tue, 19 Jan 2021 23:24:58 -0800 (PST) MIME-Version: 1.0 From: Khushboo Vashi Date: Wed, 20 Jan 2021 12:54:56 +0530 Message-ID: Subject: [pgAdmin4][Patch] - Fixed various issues of the Macros To: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000003aa35a05b94fdabf" X-CLOUD-SEC-AV-Info: enterprisedb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000003aa35a05b94fdabf Content-Type: multipart/alternative; boundary="0000000000003aa35805b94fdabd" --0000000000003aa35805b94fdabd Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix below the issues of the macro module: #5905 - Save button is enabled by-default #5906 - Consistent behaviour should be displayed if user clear manage macro #5907 - We need to fix the behaviour of Clear All Rows if user does not enter any value #5929 - Message "Not connected to the server or the connection to the server has been closed." displayed if user created SQL with invalid syntax Thanks, Khushboo --0000000000003aa35805b94fdabd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the attached patch to fix below the= issues of the macro module:

#5905 - Save button is enabled by-defau= lt
#5906 - Consistent behaviour should be displayed if user clear manag= e macro
#5907 - We need to fix the behaviour of Clear All Rows if user d= oes not enter any value
#5929 - Message "Not connected to the = server or the connection to the server has been closed." displayed if = user created SQL with invalid syntax

Thanks,
Khushboo
--0000000000003aa35805b94fdabd-- --0000000000003aa35a05b94fdabf Content-Type: application/octet-stream; name="macros.patch" Content-Disposition: attachment; filename="macros.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kk53n0dd0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbWFjcm8uanMgYi93 ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL21hY3JvLmpzCmluZGV4IGM4ZjkyOTJmMy4u NzRjN2RhYjJkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL21h Y3JvLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbWFjcm8uanMKQEAg LTE5NCw2ICsxOTQsOCBAQCBsZXQgTWFjcm9EaWFsb2cgPSB7CiAgICAgICAgICAgICAgIC8vIFdl IGdvdCB0aGUgbGF0ZXN0IGF0dHJpYnV0ZXMgb2YgdGhlIG9iamVjdC4gUmVuZGVyIHRoZSB2aWV3 CiAgICAgICAgICAgICAgIC8vIG5vdy4KICAgICAgICAgICAgICAgJGNvbnRhaW5lci5hcHBlbmQo c2VsZi52aWV3LnJlbmRlcigpLiRlbCk7CisgICAgICAgICAgICAgIHNlbGYuX19pbnRlcm5hbC5i dXR0b25zWzJdLmVsZW1lbnQuZGlzYWJsZWQgPSB0cnVlOworCiAKICAgICAgICAgICAgICAgLy8g RW5hYmxlL2Rpc2FibGUgc2F2ZSBidXR0b24gYW5kIHNob3cvaGlkZSBzdGF0dXNiYXIgYmFzZWQg b24gc2Vzc2lvbgogICAgICAgICAgICAgICBzZWxmLnZpZXcubGlzdGVuVG8oc2VsZi52aWV3Lm1v ZGVsLCAncGdhZG1pbi1zZXNzaW9uOnN0YXJ0JywgZnVuY3Rpb24oKSB7CkBAIC0yNzIsMTEgKzI3 NCwxMiBAQCBsZXQgTWFjcm9EaWFsb2cgPSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgIDxh IGNsYXNzPSJkcm9wZG93bi1pdGVtIiBpZD0iYnRuLW1hbmFnZS1tYWNyb3MiIGhyZWY9IiMiIHRh YmluZGV4PSIwIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuPiAke2dldHRl eHQoJ01hbmFnZSBNYWNyb3MuLi4nKX0gPC9zcGFuPgogICAgICAgICAgICAgICAgICAgICAgICAg ICA8L2E+Ci0gICAgICAgICAgICAgICAgICAgICAgPC9saT4KLSAgICAgICAgICAgICAgICAgICAg ICA8bGkgY2xhc3M9ImRyb3Bkb3duLWRpdmlkZXIiPjwvbGk+YDsKKyAgICAgICAgICAgICAgICAg ICAgICA8L2xpPmA7CisKKyAgICAgICAgICAgICAgICAgICAgbGV0IG1hY3JvX2xpc3RfdG1wbCA9 ICcnOwogICAgICAgICAgICAgICAgICAgICBfLmVhY2gobWFjcm9zLCBmdW5jdGlvbihtKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgaWYgKG0ubmFtZSkgewotICAgICAgICAgICAgICAgICAgICAg ICAgc3RyICs9IGA8bGk+CisgICAgICAgICAgICAgICAgICAgICAgICBtYWNyb19saXN0X3RtcGwg Kz0gYDxsaT4KICAgICAgICAgICAgICAgICAgICAgICAgIDxhIGNsYXNzPSJkcm9wZG93bi1pdGVt IGJ0bi1tYWNybyIgZGF0YS1tYWNyby1pZD0iJHttLmlkfSIgaHJlZj0iIyIgdGFiaW5kZXg9IjAi PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuPiAke18uZXNjYXBlKG0ubmFtZSl9 IDwvc3Bhbj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3Bhbj4gKCR7bS5rZXlfbGFi ZWx9KSA8L3NwYW4+CkBAIC0yODUsNiArMjg4LDcgQEAgbGV0IE1hY3JvRGlhbG9nID0gewogICAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfSk7CiAKKyAgICAgICAg ICAgICAgICAgICAgaWYgKG1hY3JvX2xpc3RfdG1wbC5sZW5ndGggPiAwKSBzdHIgKz0gJzxsaSBj bGFzcz0iZHJvcGRvd24tZGl2aWRlciI+PC9saT4nICsgbWFjcm9fbGlzdF90bXBsOwogICAgICAg ICAgICAgICAgICAgICAkKCQuZmluZCgnZGl2LmJ0bi1ncm91cC5tci0xLnVzZXJfbWFjcm9zIHVs LmRyb3Bkb3duLW1lbnUnKSkuaHRtbCgkKHN0cikpOwogCiAgICAgICAgICAgICAgICAgICAgIHNl bGYuY2xvc2UoKTsgLy8gQ2xvc2UgdGhlIGRpYWxvZyBub3cKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbWFjcm9fbW9kZWwuanMgYi93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvc3FsZWRpdG9yL21hY3JvX21vZGVsLmpzCmluZGV4IDRhOTM1MWEzOC4uNzg4NmU2M2I3 IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL21hY3JvX21vZGVs LmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbWFjcm9fbW9kZWwuanMK QEAgLTEyNiwxOCArMTI2LDIyIEBAIGV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1hY3JvTW9kZWwo dHJhbnNJZCkgewogICAgICAgICAgICAgICAgIHZhciB0aGF0ID0gdGhpczsKICAgICAgICAgICAg ICAgICAvLyBXZSB3aWxsIGNoZWNrIGlmIHJvdyBpcyBkZWxldGFibGUgb3Igbm90CiAKLSAgICAg ICAgICAgICAgICBBbGVydGlmeS5jb25maXJtKAotICAgICAgICAgICAgICAgICAgZ2V0dGV4dCgn Q2xlYXIgQWxsIFJvd3MnKSwKLSAgICAgICAgICAgICAgICAgIGdldHRleHQoJ0FyZSB5b3Ugc3Vy ZSB5b3Ugd2lzaCB0byBjbGVhciBhbGwgcm93cz8nKSwKLSAgICAgICAgICAgICAgICAgIGZ1bmN0 aW9uKCkgewotICAgICAgICAgICAgICAgICAgICBfLmVhY2godGhhdC5jb2xsZWN0aW9uLnRvSlNP TigpLCBmdW5jdGlvbihtKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgdGhhdC5jb2xsZWN0aW9u LmdldChtLmlkKS5zZXQoeyduYW1lJzogbnVsbCwgJ3NxbCc6IG51bGx9KTsKLSAgICAgICAgICAg ICAgICAgICAgfSk7Ci0gICAgICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgZnVu Y3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgICk7CisgICAgICAgICAgICAgICAgbGV0IG1hY3JvcyA9 IHRoYXQuY29sbGVjdGlvbi50b0pTT04oKS5maWx0ZXIobSA9PiBtLm5hbWUgIT09IHVuZGVmaW5l ZCAmJiBtLm5hbWUgIT09IG51bGwpOworCisgICAgICAgICAgICAgICAgaWYgKG1hY3Jvcy5sZW5n dGggPiAwKSB7CisgICAgICAgICAgICAgICAgICBBbGVydGlmeS5jb25maXJtKAorICAgICAgICAg ICAgICAgICAgICBnZXR0ZXh0KCdDbGVhciBBbGwgUm93cycpLAorICAgICAgICAgICAgICAgICAg ICBnZXR0ZXh0KCdBcmUgeW91IHN1cmUgeW91IHdpc2ggdG8gY2xlYXIgYWxsIHJvd3M/JyksCisg ICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICAgIF8u ZWFjaCh0aGF0LmNvbGxlY3Rpb24udG9KU09OKCksIGZ1bmN0aW9uKG0pIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRoYXQuY29sbGVjdGlvbi5nZXQobS5pZCkuc2V0KHsnbmFtZSc6IG51bGws ICdzcWwnOiBudWxsfSk7CisgICAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAg ICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgICApOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgfSwKICAgICAgICAg ICAgICAgcmVuZGVyOiBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICB0aGlzLiRlbC5lbXB0 eSgpOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9z cWxlZGl0b3IuanMgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVk aXRvci5qcwppbmRleCAwNWRlZWJjNDEuLjU3Njc5MzI1MiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKKysrIGIvd2ViL3BnYWRt aW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKQEAgLTQzNzYsNiArNDM3 Niw4IEBAIGRlZmluZSgndG9vbHMucXVlcnl0b29sJywgWwogCiAgICAgICAgICAgLy8gRmluZCB0 aGUgbmV4dCBzcGFjZSBmcm9tIHRoZSBjaGFyYWN0ZXIgb3IgZW5kIG9mIGxpbmUKICAgICAgICAg ICB2YXIgZXJyb3JfbGluZSA9IHNlbGYuZ3JpZFZpZXcucXVlcnlfdG9vbF9vYmouZ2V0TGluZShl cnJvcl9saW5lX25vKTsKKworICAgICAgICAgIGlmIChfLmlzVW5kZWZpbmVkKGVycm9yX2xpbmUp KSByZXR1cm47CiAgICAgICAgICAgZW5kX21hcmtlciA9IGVycm9yX2xpbmUuaW5kZXhPZignICcs IHN0YXJ0X21hcmtlcik7CiAgICAgICAgICAgaWYgKGVuZF9tYXJrZXIgPCAwKQogICAgICAgICAg ICAgZW5kX21hcmtlciA9IGVycm9yX2xpbmUubGVuZ3RoOwo= --0000000000003aa35a05b94fdabf--