Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1exrht-0008N6-23 for pgadmin-hackers@arkaria.postgresql.org; Mon, 19 Mar 2018 10:07:57 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1exrhr-00043q-JM for pgadmin-hackers@arkaria.postgresql.org; Mon, 19 Mar 2018 10:07:55 +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.89) (envelope-from ) id 1exrhr-00043g-AV for pgadmin-hackers@lists.postgresql.org; Mon, 19 Mar 2018 10:07:55 +0000 Received: from mail-oi0-x22f.google.com ([2607:f8b0:4003:c06::22f]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1exrhj-0002cJ-OE for pgadmin-hackers@postgresql.org; Mon, 19 Mar 2018 10:07:53 +0000 Received: by mail-oi0-x22f.google.com with SMTP id c18so13805666oiy.9 for ; Mon, 19 Mar 2018 03:07:47 -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=CGfz09xDBaliYDDXPOeYpsMNdSPuqDEBPR0naLTa+B0=; b=kwdOIvpGMXGzEczWr53wMg2jRl3Qsc+qyNspysZb3bdftHVMR70uVGCJZNK8cvEZhj j3+pJHrOg0mPYgKXGcrIw4VkV/QUUZVLMfeehJQltziSptDC/LObh0zqCpHWJfPCljgg fLiVGtMOZtC9FqPO6MRP9JBsl7TJ18dAoC2DVJORZo/IdMBayLWY+DUjak7yPGarEgBr wC7YoImn+BZWrY+0d7ri7In3hjsevSHZ1kcHVhjbNQGGTRBA2OUdglXXAdFxDo5s6AF2 9kdbtlGp1bpqcQTXfgeCZ71ZN+JxajjbcUA4P0bAuTwLNpWWMfROX/va4TCevgO4gZpr 5YRg== 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=CGfz09xDBaliYDDXPOeYpsMNdSPuqDEBPR0naLTa+B0=; b=kV+wtE5McjgOzOIipcl+Y2m+9qA7jediaMOcwADmCfe9wOMpHQ8A2rWG1MrercKDNm GgtoUOXLnXUQKRugqyj3bim6G3yDhRGqmx/kxiBazOqgQRDxemeg6GRXhs95Bk5ffylq c6XK1X5oMrWsaEI0Ol4c/StHMbgLIZ72WjvnPqnDCJjaMZG9RlZBvwLpsg2EhtGJjbI+ Ll36DcvyJtkbgpb1BgGEDmKAv8LjjCtYhqzqjabjzKOwN3xmnxT8SUEqE/mT90G85xMx mOBrwakOzDu8o1IdRGS1/sUsWyp5RYXVLM78QsrKSJuD4mLd0I9G/cjhpQJiAOX9lPNA /AQA== X-Gm-Message-State: AElRT7F7uxR0DKHZCD+pF6MMFRcnHaCeFalbx6N+PdNSs9qOWO5A8G2H r+dbSMl0WRRkJNO5wrpqoW4Ojy3bSXCIAG183YoOAQ== X-Google-Smtp-Source: AG47ELv9ajKKi7R56B0ldSrgyTUbEuJYBnOSy1s+WrqzmpZS3Q8jT7MAIZEeafmMbI6u84K7DhB0tpBZbYXEcw2a9N8= X-Received: by 10.202.95.215 with SMTP id t206mr6812693oib.264.1521454066592; Mon, 19 Mar 2018 03:07:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.74.8.150 with HTTP; Mon, 19 Mar 2018 03:07:25 -0700 (PDT) From: Murtuza Zabuawala Date: Mon, 19 Mar 2018 15:37:25 +0530 Message-ID: Subject: [pgAdmin4][RM#3200] Don't set empty string for host/hostaddr in model when service is used To: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a113cd0722ece470567c12132" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a113cd0722ece470567c12132 Content-Type: multipart/alternative; boundary="001a113cd0722ece430567c12130" --001a113cd0722ece430567c12130 Content-Type: text/plain; charset="UTF-8" Hi, PFA patch to fix the issue where pgAdmin4 was not able to utilise the host parameter from service file. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a113cd0722ece430567c12130 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to= fix the issue where pgAdmin4 was not able to utilise the host parameter fr= om service file.

--
Regards,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.= enterprisedb.com
The Enterprise PostgreSQL Company

<= /div>
--001a113cd0722ece430567c12130-- --001a113cd0722ece470567c12132 Content-Type: application/octet-stream; name="RM_3200.diff" Content-Disposition: attachment; filename="RM_3200.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jey1f4u10 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19p bml0X18ucHkKaW5kZXggZmVjYjY2ZC4uNDFlYjQyOSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKQEAgLTUwMCw3ICs1 MDAsNyBAQCBjbGFzcyBTZXJ2ZXJOb2RlKFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIGlmICdk Yl9yZXMnIGluIGRhdGE6CiAgICAgICAgICAgICBkYXRhWydkYl9yZXMnXSA9ICcsJy5qb2luKGRh dGFbJ2RiX3JlcyddKQogCi0gICAgICAgIGlmICdob3N0YWRkcicgaW4gZGF0YSBhbmQgZGF0YVsn aG9zdGFkZHInXSAhPSAnJzoKKyAgICAgICAgaWYgJ2hvc3RhZGRyJyBpbiBkYXRhIGFuZCBkYXRh Wydob3N0YWRkciddIGFuZCBkYXRhWydob3N0YWRkciddICE9ICcnOgogICAgICAgICAgICAgaWYg bm90IHNlbGYucGF0NC5tYXRjaChkYXRhWydob3N0YWRkciddKToKICAgICAgICAgICAgICAgICBp ZiBub3Qgc2VsZi5wYXQ2Lm1hdGNoKGRhdGFbJ2hvc3RhZGRyJ10pOgogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApAQCAtNzAwLDcgKzcwMCw3IEBAIGNsYXNz IFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgKQogICAg ICAgICAgICAgICAgICkKIAotICAgICAgICBpZiAnaG9zdGFkZHInIGluIGRhdGEgYW5kIGRhdGFb J2hvc3RhZGRyJ10gIT0gJyc6CisgICAgICAgIGlmICdob3N0YWRkcicgaW4gZGF0YSBhbmQgZGF0 YVsnaG9zdGFkZHInXSBhbmQgZGF0YVsnaG9zdGFkZHInXSAhPSAnJzoKICAgICAgICAgICAgIGlm IG5vdCBzZWxmLnBhdDQubWF0Y2goZGF0YVsnaG9zdGFkZHInXSk6CiAgICAgICAgICAgICAgICAg aWYgbm90IHNlbGYucGF0Ni5tYXRjaChkYXRhWydob3N0YWRkciddKToKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L3N0YXRpYy9qcy9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9tb2RlbF92YWxpZGF0aW9u LmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L21vZGVsX3ZhbGlkYXRpb24uanMKaW5kZXggOTQ4YWYzZC4uZjE2MjdhYSAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVs X3ZhbGlkYXRpb24uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3ZhbGlkYXRpb24uanMKQEAgLTMxLDYgKzMxLDggQEAgZXhw b3J0IGNsYXNzIE1vZGVsVmFsaWRhdGlvbiB7CiAgICAgdGhpcy5jaGVja0ZvckVtcHR5KCduYW1l JywgZ2V0dGV4dCgnTmFtZSBtdXN0IGJlIHNwZWNpZmllZC4nKSk7CiAKICAgICBpZiAoTW9kZWxW YWxpZGF0aW9uLmlzRW1wdHlTdHJpbmcoc2VydmljZUlkKSkgeworICAgICAgLy8gRG8gbm90IHNl bnQgZW1wdHkgc3RyaW5nCisgICAgICB0aGlzLnNldE51bGxWYWx1ZUZvckVtcHR5U3RyaW5nKCdz ZXJ2aWNlJyk7CiAgICAgICB0aGlzLmNoZWNrSG9zdEFuZEhvc3RBZGRyZXNzKCk7CiAKICAgICAg IHRoaXMuY2hlY2tGb3JFbXB0eSgnZGInLCBnZXR0ZXh0KCdNYWludGVuYW5jZSBkYXRhYmFzZSBt dXN0IGJlIHNwZWNpZmllZC4nKSk7CkBAIC01MCw4ICs1MiwyMCBAQCBleHBvcnQgY2xhc3MgTW9k ZWxWYWxpZGF0aW9uIHsKICAgICByZXR1cm4gbnVsbDsKICAgfQogCisgIHNldE51bGxWYWx1ZUZv ckVtcHR5U3RyaW5nKGZpZWxkKSB7CisgICAgbGV0IHZhbCA9IHRoaXMubW9kZWwuZ2V0KGZpZWxk KTsKKyAgICBpZiAoXy5pc1VuZGVmaW5lZCh2YWwpIHx8IF8uaXNOdWxsKHZhbCkpCisgICAgICBy ZXR1cm47CisKKyAgICAvLyBUbyBhdm9pZCBwYXNzaW5nIGVtcHR5IHN0cmluZyB0byBjb25uZWN0 aW9uIHBhcmFtZXRlcgorICAgIGlmKFN0cmluZyh2YWwpLnRyaW0oKSA9PT0gJycpIHsKKyAgICAg IHRoaXMubW9kZWwuc2V0KGZpZWxkLCBudWxsKTsKKyAgICB9CisgIH0KKwogICBjbGVhckhvc3RB ZGRyZXNzQW5kRGJFcnJvcnMoKSB7CiAgICAgXy5lYWNoKFsnaG9zdCcsICdob3N0YWRkcicsICdk YiddLCAoaXRlbSkgPT4geworICAgICAgdGhpcy5zZXROdWxsVmFsdWVGb3JFbXB0eVN0cmluZyhp dGVtKTsKICAgICAgIHRoaXMubW9kZWwuZXJyb3JNb2RlbC51bnNldChpdGVtKTsKICAgICB9KTsK ICAgfQpkaWZmIC0tZ2l0IGEvd2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9tb2RlbF92YWxpZGF0aW9uX3NwZWMuanMgYi93ZWIvcmVncmVzc2lv bi9qYXZhc2NyaXB0L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3ZhbGlkYXRp b25fc3BlYy5qcwppbmRleCA1NjBkOGI2Li44NWU1MWViIDEwMDY0NAotLS0gYS93ZWIvcmVncmVz c2lvbi9qYXZhc2NyaXB0L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3ZhbGlk YXRpb25fc3BlYy5qcworKysgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3ZhbGlkYXRpb25fc3BlYy5qcwpAQCAtMjAsNiArMjAs OSBAQCBkZXNjcmliZSgnU2VydmVyI01vZGVsVmFsaWRhdGlvbicsICgpID0+IHsKICAgICAgICAg Z2V0OiBmdW5jdGlvbiAoa2V5KSB7CiAgICAgICAgICAgcmV0dXJuIHRoaXMuYWxsVmFsdWVzW2tl eV07CiAgICAgICAgIH0sCisgICAgICAgIHNldDogZnVuY3Rpb24gKGtleSwgdmFsdWUpIHsKKyAg ICAgICAgICB0aGlzLmtleSA9IHZhbHVlOworICAgICAgICB9LAogICAgICAgICBzZXNzQXR0cnM6 IHt9LAogICAgICAgfTsKICAgICAgIG1vZGVsLmlzTmV3ID0gamFzbWluZS5jcmVhdGVTcHkoJ2lz TmV3Jyk7CkBAIC01MSw2ICs1NCwyMCBAQCBkZXNjcmliZSgnU2VydmVyI01vZGVsVmFsaWRhdGlv bicsICgpID0+IHsKICAgICAgICAgICBleHBlY3QobW9kZWwuZXJyb3JNb2RlbC5zZXQpLnRvSGF2 ZUJlZW5DYWxsZWRXaXRoKHt9KTsKICAgICAgICAgfSk7CiAgICAgICB9KTsKKworICAgICAgZGVz Y3JpYmUoJ1NlcnZpY2UgaWQgcHJlc2VudCcsICgpID0+IHsKKyAgICAgICAgaXQoJ3NldHMgZW1w dHkgc2VydmljZSBuYW1lIHdoaWNoIHNob3VsZCB0aHJvdyBhbiBlcnJvcicsICgpID0+IHsKKyAg ICAgICAgICBtb2RlbC5hbGxWYWx1ZXNbJ3NlcnZpY2UnXSA9ICcnOworICAgICAgICAgIGV4cGVj dChtb2RlbFZhbGlkYXRpb24udmFsaWRhdGUoKSkudG9CZSgnRWl0aGVyIEhvc3QgbmFtZSwgQWRk cmVzcyBvciBTZXJ2aWNlIG11c3QgYmUgc3BlY2lmaWVkLicpOworICAgICAgICAgIGV4cGVjdCht b2RlbC5lcnJvck1vZGVsLnNldCkudG9IYXZlQmVlbkNhbGxlZFdpdGgoeworICAgICAgICAgICAg aG9zdDogJ0VpdGhlciBIb3N0IG5hbWUsIEFkZHJlc3Mgb3IgU2VydmljZSBtdXN0IGJlIHNwZWNp ZmllZC4nLAorICAgICAgICAgICAgaG9zdGFkZHI6ICdFaXRoZXIgSG9zdCBuYW1lLCBBZGRyZXNz IG9yIFNlcnZpY2UgbXVzdCBiZSBzcGVjaWZpZWQuJywKKyAgICAgICAgICAgIGRiOiAnTWFpbnRl bmFuY2UgZGF0YWJhc2UgbXVzdCBiZSBzcGVjaWZpZWQuJworICAgICAgICAgIH0pOworICAgICAg ICB9KTsKKyAgICAgIH0pOworCisKICAgICB9KTsKIAogICAgIGRlc2NyaWJlKCdXaGVuIG5vIHBh cmFtZXRlcnMgYXJlIHZhbGlkJywgKCkgPT4gewo= --001a113cd0722ece470567c12132--