Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmyJ9-0002qa-DQ for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 07:20:35 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bmyJ9-0000py-0c for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 07:20:35 +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 1bmyJ8-0000pq-IM for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 07:20:34 +0000 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bmyJ4-0006PW-EU for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 07:20:33 +0000 Received: by mail-qk0-x229.google.com with SMTP id g67so8372009qkd.0 for ; Thu, 22 Sep 2016 00:20:29 -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=/KSMJ2s4iOsUcDjOE3w3kH6lrp/N9lNMmRsrQjVjBdk=; b=0bjgBg2mzdGiDc7u53k9zrgkM3eK6y+fCS4YiJgGF0Nc8BbKadr+7YyfKM3rsMIMqi sek1HFz78zZkfVXwM7vr2vfjWPNvVl4KUtNJ7skzJq39beNpmbuMRzp/9OZCivpY6C9o 1cu7wBh6ONEV1U53QwVToeadZRgDN+46b+8yznoU9RSkhwE5baLn1FA7xZzdkKW86zn4 aJ2Y2iN0H97pno3dEZ10FJtUT+3yyQDkRuVTdxKixsO+OVhhLipC1FRLIHYMRuDDu+0V qTRxnhpuM7yWrpFPM09IEs7rKhh2TgmDrA0vB3SeuCVGdVagNtwG4bxLYL8Mci2mDqQT ZpJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=/KSMJ2s4iOsUcDjOE3w3kH6lrp/N9lNMmRsrQjVjBdk=; b=NRuwkRR1VeWuCKhbSVyYbYTUOW3MWMiidgxazMdkyUioZcS4ejxKfSGzpUXFpwMBm1 t2/hF4eJj704+p6AIy5pXLxGTmn35Wrgtqr+3eHsDKmsc2jx13Wf0Z8ETBbvZD2OcvJ8 YRPuWUHAFEDIcBV8Yl5VrdXTiSc8ppg31WLMwTchIg87xaiWCWUFpJfaVstnAAkFzEIU L0hUefmiykrmJU3MFs0NI8x4145377tXlAt3gmWta8i/uBh33EQ7LGCg5NuQujao/BSX ZpgTXuYS+2cuFrajV6jN3/8c1i7LrDzGXQcFXR2T/ZR/8O5RHsEYycy6rS0L7D3ojhQC JoeQ== X-Gm-Message-State: AA6/9RlWprk+6mc93sY+Gq0Mhq1D/YCnwkLfBj8IlDshPvVTHl7Kmx1ZFLouqOLaD5ksLXFHgIZNbm1Rmle8KUcJ X-Received: by 10.55.141.5 with SMTP id p5mr428540qkd.223.1474528828468; Thu, 22 Sep 2016 00:20:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Thu, 22 Sep 2016 00:20:07 -0700 (PDT) From: Murtuza Zabuawala Date: Thu, 22 Sep 2016 12:50:07 +0530 Message-ID: Subject: PATCH: To fix the issue with stats table in PG9.6 (pgAdmin4) To: pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c0858720856ba053d137fc6 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 --94eb2c0858720856ba053d137fc6 Content-Type: multipart/alternative; boundary=94eb2c0858720856b5053d137fc4 --94eb2c0858720856b5053d137fc4 Content-Type: text/plain; charset=UTF-8 Hi, PFA patch to fix the issue where pgAdmin4 was throwing error when user clicks on Statistics tab when using PG9.6. RM#1719 *Issue:* The column `waiting` has been removed from `pg_stat_activity` View instead two new columns has been added `wait_event` and `wait_event_type`. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --94eb2c0858720856b5053d137fc4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue where pg= Admin4 was throwing error when user clicks on Statistics tab when using PG9= .6.
RM#1719

Issue:=C2=A0
The column `waiting`=C2=A0has been r= emoved from `pg_stat_activity` View instead two new columns has been added = `wait_event` and `wait_event_type`.

--
Regards,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The En= terprise PostgreSQL Company
--94eb2c0858720856b5053d137fc4-- --94eb2c0858720856ba053d137fc6 Content-Type: text/x-patch; charset=US-ASCII; name="RM_1719.patch" Content-Disposition: attachment; filename="RM_1719.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ite0cr9l0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKaW5kZXggMGI2YzZj YS4uMjQ4NTllOCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18u cHkKQEAgLTY2MiwxNyArNjYyLDI2IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdD aGlsZE5vZGVWaWV3KToKICAgICBkZWYgbW9kaWZpZWRfc3FsKHNlbGYsIGdp ZCwgc2lkKToKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShk YXRhPScnKQogCisgICAgZGVmIGdldF90ZW1wbGF0ZV9kaXJlY3Rvcnkoc2Vs ZiwgdmVyc2lvbik6CisgICAgICAgICIiIiBUaGlzIGZ1bmN0aW9uIHdpbGwg Y2hlY2sgYW5kIHJldHVybiB0ZW1wbGF0ZSBkaXJlY3RvcnkKKyAgICAgICAg YmFzZWQgb24gcG9zdGdyZXMgdmVyaW9uIiIiCisgICAgICAgIGlmIHZlcnNp b24gPj0gOTA2MDA6CisgICAgICAgICAgICByZXR1cm4gJzkuNl9wbHVzJwor ICAgICAgICBlbGlmIHZlcnNpb24gPj0gOTAyMDA6CisgICAgICAgICAgICBy ZXR1cm4gJzkuMl9wbHVzJworICAgICAgICBlbHNlOgorICAgICAgICAgICAg cmV0dXJuICc5LjFfcGx1cycKKwogICAgIGRlZiBzdGF0aXN0aWNzKHNlbGYs IGdpZCwgc2lkKToKICAgICAgICAgZnJvbSBwZ2FkbWluLnV0aWxzLmRyaXZl ciBpbXBvcnQgZ2V0X2RyaXZlcgogICAgICAgICBtYW5hZ2VyID0gZ2V0X2Ry aXZlcihQR19ERUZBVUxUX0RSSVZFUikuY29ubmVjdGlvbl9tYW5hZ2VyKHNp ZCkKICAgICAgICAgY29ubiA9IG1hbmFnZXIuY29ubmVjdGlvbigpCi0KICAg ICAgICAgaWYgY29ubi5jb25uZWN0ZWQoKToKICAgICAgICAgICAgIHN0YXR1 cywgcmVzID0gY29ubi5leGVjdXRlX2RpY3QoCiAgICAgICAgICAgICAgICAg cmVuZGVyX3RlbXBsYXRlKAogICAgICAgICAgICAgICAgICAgICAiLyIuam9p bihbCiAgICAgICAgICAgICAgICAgICAgICAgICAnc2VydmVycy9zcWwnLAot ICAgICAgICAgICAgICAgICAgICAgICAgJzkuMl9wbHVzJyBpZiBtYW5hZ2Vy LnZlcnNpb24gPj0gOTAyMDAgZWxzZSAnOS4xX3BsdXMnLAorICAgICAgICAg ICAgICAgICAgICAgICAgc2VsZi5nZXRfdGVtcGxhdGVfZGlyZWN0b3J5KG1h bmFnZXIudmVyc2lvbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAnc3Rh dHMuc3FsJwogICAgICAgICAgICAgICAgICAgICBdKSwKICAgICAgICAgICAg ICAgICAgICAgY29ubj1jb25uLCBfPWdldHRleHQKQEAgLTEwNTMsNyArMTA2 Miw3IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKIAog ICAgICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFsK ICAgICAgICAgICAgICAgICAnc2VydmVycy9zcWwnLAotICAgICAgICAgICAg ICAgICc5LjJfcGx1cycgaWYgbWFuYWdlci52ZXJzaW9uID49IDkwMjAwIGVs c2UgJzkuMV9wbHVzJywKKyAgICAgICAgICAgICAgICBzZWxmLmdldF90ZW1w bGF0ZV9kaXJlY3RvcnkobWFuYWdlci52ZXJzaW9uKSwKICAgICAgICAgICAg ICAgICAnY2hhbmdlX3Bhc3N3b3JkLnNxbCcKICAgICAgICAgICAgIF0pLAog ICAgICAgICAgICAgICAgIGNvbm49Y29ubiwgXz1nZXR0ZXh0LApkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvdGVtcGxhdGVzL3NlcnZlcnMvc3FsLzkuNl9wbHVzL2NoYW5nZV9wYXNz d29yZC5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy9zcWwvOS42X3BsdXMvY2hhbmdl X3Bhc3N3b3JkLnNxbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5kY2YwZWMxCi0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZl cnMvc3FsLzkuNl9wbHVzL2NoYW5nZV9wYXNzd29yZC5zcWwKQEAgLTAsMCAr MSwyIEBACit7IyBDaGFuZ2UgZGF0YWJhc2Ugc2VydmVyIHBhc3N3b3JkICN9 CitBTFRFUiBVU0VSIHt7Y29ubnxxdElkZW50KHVzZXIpfX0gV0lUSCBFTkNS WVBURUQgUEFTU1dPUkQge3tlbmNyeXB0ZWRfcGFzc3dvcmR8cXRMaXRlcmFs fX07CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy9zcWwvOS42X3BsdXMv c3RhdHMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvc3FsLzkuNl9wbHVzL3N0YXRz LnNxbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMWRi YzM3Ci0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvc3FsLzku Nl9wbHVzL3N0YXRzLnNxbApAQCAtMCwwICsxLDUxIEBACitTRUxFQ1QKKyAg ICBwaWQgQVMgIlBJRCIsCisgICAgdXNlbmFtZSBBUyB7eyBjb25ufHF0SWRl bnQoXygnVXNlcicpKSB9fSwKKyAgICBkYXRuYW1lIEFTIHt7IGNvbm58cXRJ ZGVudChfKCdEYXRhYmFzZScpKSB9fSwKKyAgICBiYWNrZW5kX3N0YXJ0IEFT IHt7IGNvbm58cXRJZGVudChfKCdCYWNrZW5kIHN0YXJ0JykpIH19LAorICAg IENBU0UKKyAgICBXSEVOIGNsaWVudF9ob3N0bmFtZSBJUyBOT1QgTlVMTCBB TkQgY2xpZW50X2hvc3RuYW1lICE9ICcnIFRIRU4KKyAgICAgICAgY2xpZW50 X2hvc3RuYW1lIHx8ICc6JyB8fCBjbGllbnRfcG9ydAorICAgIFdIRU4gY2xp ZW50X2FkZHIgSVMgTk9UIE5VTEwgQU5EIGNsaWVudF9hZGRyOjp0ZXh0ICE9 ICcnIFRIRU4KKyAgICAgICAgY2xpZW50X2FkZHIgfHwgJzonIHx8IGNsaWVu dF9wb3J0CisgICAgV0hFTiBjbGllbnRfcG9ydCA9IC0xIFRIRU4KKyAgICAg ICAgJ2xvY2FsIHBpcGUnCisgICAgRUxTRQorICAgICAgICAnbG9jYWxob3N0 OicgfHwgY2xpZW50X3BvcnQKKyAgICBFTkQgQVMge3sgY29ubnxxdElkZW50 KF8oJ0NsaWVudCcpKSB9fSwKKyAgICBhcHBsaWNhdGlvbl9uYW1lIEFTIHt7 IGNvbm58cXRJZGVudChfKCdBcHBsaWNhdGlvbicpKSB9fSwKKyAgICB3YWl0 X2V2ZW50X3R5cGUgQVMge3sgY29ubnxxdElkZW50KF8oJ1dhaXQgZXZlbnQg dHlwZScpKSB9fSwKKyAgICB3YWl0X2V2ZW50IEFTIHt7IGNvbm58cXRJZGVu dChfKCdXYWl0IGV2ZW50IG5hbWUnKSkgfX0sCisgICAgcXVlcnkgQVMge3sg Y29ubnxxdElkZW50KF8oJ1F1ZXJ5JykpIH19LAorICAgIHF1ZXJ5X3N0YXJ0 IEFTIHt7IGNvbm58cXRJZGVudChfKCdRdWVyeSBzdGFydCcpKSB9fSwKKyAg ICB4YWN0X3N0YXJ0IEFTIHt7IGNvbm58cXRJZGVudChfKCdYYWN0IHN0YXJ0 JykpIH19CitGUk9NCisgICAgcGdfc3RhdF9hY3Rpdml0eSBzYQorV0hFUkUK KyAgICAoU0VMRUNUIHIucm9sc3VwZXIgT1Igci5vaWQgPSBzYS51c2VzeXNp ZCAgRlJPTSBwZ19yb2xlcyByIFdIRVJFIHIucm9sbmFtZSA9IGN1cnJlbnRf dXNlcikKK1VOSU9OCitTRUxFQ1QKKyAgICBwaWQgQVMgIlBJRCIsCisgICAg dXNlbmFtZSBBUyB7eyBjb25ufHF0SWRlbnQoXygnVXNlcicpKSB9fSwKKyAg ICAnJyBBUyB7eyBjb25ufHF0SWRlbnQoXygnRGF0YWJhc2UnKSkgfX0sCisg ICAgYmFja2VuZF9zdGFydCBBUyB7eyBjb25ufHF0SWRlbnQoXygnQmFja2Vu ZCBzdGFydCcpKSB9fSwKKyAgICBDQVNFCisgICAgV0hFTiBjbGllbnRfaG9z dG5hbWUgSVMgTk9UIE5VTEwgQU5EIGNsaWVudF9ob3N0bmFtZSAhPSAnJyBU SEVOCisgICAgICAgIGNsaWVudF9ob3N0bmFtZSB8fCAnOicgfHwgY2xpZW50 X3BvcnQKKyAgICBXSEVOIGNsaWVudF9hZGRyIElTIE5PVCBOVUxMIEFORCBj bGllbnRfYWRkcjo6dGV4dCAhPSAnJyBUSEVOCisgICAgICAgIGNsaWVudF9h ZGRyIHx8ICc6JyB8fCBjbGllbnRfcG9ydAorICAgIFdIRU4gY2xpZW50X3Bv cnQgPSAtMSBUSEVOCisgICAgICAgICdsb2NhbCBwaXBlJworICAgIEVMU0UK KyAgICAgICAgJ2xvY2FsaG9zdDonIHx8IGNsaWVudF9wb3J0CisgICAgRU5E IEFTIHt7IGNvbm58cXRJZGVudChfKCdDbGllbnQnKSkgfX0sCisgICAge3sg XygnU3RyZWFtaW5nIFJlcGxpY2F0aW9uJyl8cXRMaXRlcmFsIH19IEFTIHt7 IGNvbm58cXRJZGVudChfKCdBcHBsaWNhdGlvbicpKSB9fSwKKyAgICBudWxs IEFTIHt7IGNvbm58cXRJZGVudChfKCdXYWl0IGV2ZW50IHR5cGUnKSkgfX0s CisgICAgbnVsbCBBUyB7eyBjb25ufHF0SWRlbnQoXygnV2FpdCBldmVudCBu YW1lJykpIH19LAorICAgIHN0YXRlIHx8ICcgW3N5bmMgKHN0YXRlOiAnIHx8 IENPQUxFU0NFKHN5bmNfc3RhdGUsICcnKSB8fCAnLCBwcmlvcml0eTogJyB8 fCBzeW5jX3ByaW9yaXR5Ojp0ZXh0IHx8ICcpXSAoJyB8fCBzZW50X2xvY2F0 aW9uIHx8ICcgc2VudCwgJyB8fCB3cml0ZV9sb2NhdGlvbiB8fCAnIHdyaXR0 ZW4sICcgfHwgZmx1c2hfbG9jYXRpb24gfHwgJyBmbHVzaGVkLCAnIHx8IHJl cGxheV9sb2NhdGlvbiB8fCAnIGFwcGxpZWQpJyBBUyB7eyBjb25ufHF0SWRl bnQoXygnUXVlcnknKSkgfX0sCisgICAgbnVsbCBBUyB7eyBjb25ufHF0SWRl bnQoXygnUXVlcnkgc3RhcnQnKSkgfX0sCisgICAgbnVsbCBBUyB7eyBjb25u fHF0SWRlbnQoXygnWGFjdCBzdGFydCcpKSB9fQorRlJPTQorICAgIHBnX3N0 YXRfcmVwbGljYXRpb24gc2EKK1dIRVJFCisgICAgKFNFTEVDVCByLnJvbHN1 cGVyIE9SIHIub2lkID0gc2EudXNlc3lzaWQgIEZST00gcGdfcm9sZXMgciBX SEVSRSByLnJvbG5hbWUgPSBjdXJyZW50X3VzZXIpCg== --94eb2c0858720856ba053d137fc6 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 --94eb2c0858720856ba053d137fc6--