Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bk4XD-0000A4-UP for pgadmin-hackers@arkaria.postgresql.org; Wed, 14 Sep 2016 07:23:08 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bk4XC-0005bt-S4 for pgadmin-hackers@arkaria.postgresql.org; Wed, 14 Sep 2016 07:23:06 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bk4Wz-0005Nk-DS for pgadmin-hackers@postgresql.org; Wed, 14 Sep 2016 07:22:53 +0000 Received: from mail-qt0-x233.google.com ([2607:f8b0:400d:c0d::233]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bk4Ws-0000Hu-1F for pgadmin-hackers@postgresql.org; Wed, 14 Sep 2016 07:22:51 +0000 Received: by mail-qt0-x233.google.com with SMTP id 11so2523071qtc.0 for ; Wed, 14 Sep 2016 00:22:45 -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=08ECAL4j6XmoZJz23WW0XCHZUczQaRhMSC9oYeh2LyA=; b=FcjZs31AayDvVEVFMvqyX/9e6ZjLisTsBKMN1/hlZpOuEu2I++ECksNrcSNqEwRQ/L eOT7ENzM0OaRAmfVx3k9MSTiLjyGCDe0jY1bAhY5RDc1fzT/4n7SlSOw8kla7ydwpuic SEA2Z3TOTW7lSAeKVY/mab7YbFEhrS65EAJAEwWw6VsyrxCfvvXNssEZS0Va5lVKDbWD lcfodlLFg8r/Cxoi5CJlo4w8R5svp/eQ3e/iNHFs4FtjFf643qP/mgA+BPxgwTgoMaan hFO0G3D64e4ID/PD2Gp2eGU55JZFxjDuo1ZkR6CMqdj28LaqKCNG8hJq19HcgjKJ4+Z6 REkw== 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=08ECAL4j6XmoZJz23WW0XCHZUczQaRhMSC9oYeh2LyA=; b=hadHQeTVjMf66ztThAz7AK32wTb/CZazDU+J4Az8Ryy5V1EJTynVtoHl/dTyln/PZP qgb5HwSaslZcpMBJP/pm0d0t9lNud9VYXl25FgiaFf7gGYW08OR6T+AEs7xTa+B1Y1ZA 20QFAaDnxjNCFO7LM60zt9vKv7WoNWINWQgCGB0OcMJ+/7SHcGV6yzIu9e3Ak3ztGCL6 ht89FY0s/QWsmW2d+CgA6VCh/fXW+upbOqqC5E+rjiVZLf3LMr0lAI9L4FtAz1nSH0iS 4OWpwsVBvRAmo5l7bBis1SIzr+cZZ/vFY0syE8s46uxstGno/oyvVPgdXrUr0nfQHht1 AGKA== X-Gm-Message-State: AE9vXwMJsLCCM0FTjvVDeX1ybakJRx9EK00J4sPRLebYOnBA0rjZeEh6GR/JTkxn8P3/Refqu6Lk6QKteefO+J4/ X-Received: by 10.237.59.51 with SMTP id p48mr1174593qte.95.1473837764933; Wed, 14 Sep 2016 00:22:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Wed, 14 Sep 2016 00:22:24 -0700 (PDT) From: Murtuza Zabuawala Date: Wed, 14 Sep 2016 12:52:24 +0530 Message-ID: Subject: PATCH: Do not sort columns based on their lables (pgAdmin4) To: pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c19078a6ff808053c72989f 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 --94eb2c19078a6ff808053c72989f Content-Type: multipart/alternative; boundary=94eb2c19078a6ff7ff053c72989d --94eb2c19078a6ff7ff053c72989d Content-Type: text/plain; charset=UTF-8 Hi, PFA patch to fix the issue where we were sorting columns based on labels instead of their position. RM#1687 Please review. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --94eb2c19078a6ff7ff053c72989d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue where we= were sorting columns based on labels instead of their position.
= RM#1687

Please review.
--
Regards,
Murtuza Zabu= awala
EnterpriseDB:=C2=A0ht= tp://www.enterprisedb.com
The Enterprise PostgreSQL Company
<= /div>
--94eb2c19078a6ff7ff053c72989d-- --94eb2c19078a6ff808053c72989f Content-Type: text/x-patch; charset=US-ASCII; name="RM_1687.patch" Content-Disposition: attachment; filename="RM_1687.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_it2kwyx80 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jy b3dzZXIvanMvYnJvd3Nlci5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVt cGxhdGVzL2Jyb3dzZXIvanMvYnJvd3Nlci5qcwppbmRleCA3YTIwMmU4Li4y ZTQ5NGFiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBs YXRlcy9icm93c2VyL2pzL2Jyb3dzZXIuanMKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9qcy9icm93c2VyLmpzCkBAIC0z NSw3ICszNSw3IEBAIGZ1bmN0aW9uKHJlcXVpcmUsICQsIF8sIFMsIEJvb3Rz dHJhcCwgcGdBZG1pbiwgQWxlcnRpZnksIENvZGVNaXJyb3IpIHsKIAogICB2 YXIgcHJvY2Vzc1RyZWVEYXRhID0gZnVuY3Rpb24ocGF5bG9hZCkgewogICAg IHZhciBkYXRhID0gSlNPTi5wYXJzZShwYXlsb2FkKS5kYXRhLnNvcnQoZnVu Y3Rpb24oYSwgYikgewotICAgICAgcmV0dXJuIHBnQWRtaW4ubmF0dXJhbF9z b3J0KGEubGFiZWwsIGIubGFiZWwsIHt9KTsKKyAgICAgICAgcmV0dXJuIHBn QWRtaW4ubmF0dXJhbF9zb3J0KGEubGFiZWwsIGIubGFiZWwsIHsnX3R5cGUn OiBhLl90eXBlfSk7CiAgICAgfSk7CiAgICAgXy5lYWNoKGRhdGEsIGZ1bmN0 aW9uKGQpewogICAgICAgZC5fbGFiZWwgPSBkLmxhYmVsOwpAQCAtODU1LDcg Kzg1NSw3IEBAIGZ1bmN0aW9uKHJlcXVpcmUsICQsIF8sIFMsIEJvb3RzdHJh cCwgcGdBZG1pbiwgQWxlcnRpZnksIENvZGVNaXJyb3IpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgZCA9IGN0eC50Lml0ZW1EYXRhKGkpOwogICAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcGdBZG1pbi5uYXR1cmFsX3NvcnQoCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkLl9sYWJlbCwgX2RhdGEuX2xhYmVsLCB7 fQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC5fbGFiZWwsIF9k YXRhLl9sYWJlbCwgeydfdHlwZSc6IGQuX3R5cGV9CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKSA9PSAxCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKQEAgLTg4MCw3ICs4ODAsNyBAQCBmdW5jdGlvbihyZXF1aXJlLCAkLCBf LCBTLCBCb290c3RyYXAsIHBnQWRtaW4sIEFsZXJ0aWZ5LCBDb2RlTWlycm9y KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgIGQgPSBjdHgudC5pdGVt RGF0YShpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBnQWRtaW4ubmF0dXJhbF9zb3J0 KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC5fbGFiZWwsIF9k YXRhLl9sYWJlbCwge30KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGQuX2xhYmVsLCBfZGF0YS5fbGFiZWwsIHsnX3R5cGUnOiBkLl90eXBlfQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICkgIT0gLTEKICAgICAgICAg ICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOwpAQCAtODg4LDcgKzg4OCw3IEBAIGZ1bmN0aW9u KHJlcXVpcmUsICQsIF8sIFMsIEJvb3RzdHJhcCwgcGdBZG1pbiwgQWxlcnRp ZnksIENvZGVNaXJyb3IpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ZCA9IGN0eC50Lml0ZW1EYXRhKGkpOwogICAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGdBZG1p bi5uYXR1cmFsX3NvcnQoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkLl9sYWJlbCwgX2RhdGEuX2xhYmVsLCB7fQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZC5fbGFiZWwsIF9kYXRhLl9sYWJlbCwgeydfdHlw ZSc6IGQuX3R5cGV9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKSAh PSAxCiAgICAgICAgICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTg5Nyw3ICs4OTcs NyBAQCBmdW5jdGlvbihyZXF1aXJlLCAkLCBfLCBTLCBCb290c3RyYXAsIHBn QWRtaW4sIEFsZXJ0aWZ5LCBDb2RlTWlycm9yKSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgIGQgPSBjdHgudC5pdGVtRGF0YShpKTsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBnQWRtaW4ubmF0dXJhbF9zb3J0KAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZC5fbGFiZWwsIF9kYXRhLl9sYWJlbCwge30KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQuX2xhYmVsLCBfZGF0YS5f bGFiZWwsIHsnX3R5cGUnOiBkLl90eXBlfQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICkgPT0gMQogICAgICAgICAgICAgICAgICAgICAgICAgICAp IHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzID0gbSArIDE7CmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvcGdhZG1pbi5qcyBi L3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9wZ2FkbWluLmpzCmluZGV4IDdhYjFl M2YuLmZkMTc1ZjcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9q cy9wZ2FkbWluLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9wZ2Fk bWluLmpzCkBAIC00MCw2ICs0MCwxMSBAQAogICAgICAgICBvRnhOY0wsIG9G eU5jTCwKICAgICAgICAgbXVsdCA9IG9wdGlvbnMuZGVzYyA/IC0xIDogMTsK IAorICAgIC8vIElmIG9iamVjdCBpcyBvZiBjb2x1bW4gdHlwZSB0aGVuIGRv IG5vdCBzb3J0CisgICAgaWYob3B0aW9ucy5oYXNPd25Qcm9wZXJ0eSgiX3R5 cGUiKSAmJiBvcHRpb25zLl90eXBlICYmCisgICAgICAgIChvcHRpb25zLl90 eXBlICE9ICdjb2x1bW4nIHx8IG9wdGlvbnMuX3R5cGUgIT0gJ2NhdGFsb2df b2JqZWN0X2NvbHVtbicpKQorICAgICAgcmV0dXJuIDA7CisKICAgICAvLyBm aXJzdCB0cnkgYW5kIHNvcnQgSGV4IGNvZGVzIG9yIERhdGVzCiAgICAgaWYg KHlEKQogICAgICAgaWYgKCB4RCA8IHlEICkgcmV0dXJuIC0xICogbXVsdDsK --94eb2c19078a6ff808053c72989f 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 --94eb2c19078a6ff808053c72989f--