Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHVLl-0007hM-MY for pgadmin-hackers@arkaria.postgresql.org; Mon, 27 Jun 2016 12:09:13 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bHVLl-0008L1-1Y for pgadmin-hackers@arkaria.postgresql.org; Mon, 27 Jun 2016 12:09:13 +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 1bHVLX-000878-PY for pgadmin-hackers@postgresql.org; Mon, 27 Jun 2016 12:08:59 +0000 Received: from mail-qt0-x233.google.com ([2607:f8b0:400d:c0d::233]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bHVLQ-0005ky-9s for pgadmin-hackers@postgresql.org; Mon, 27 Jun 2016 12:08:58 +0000 Received: by mail-qt0-x233.google.com with SMTP id f89so20585515qtd.2 for ; Mon, 27 Jun 2016 05:08:51 -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=bJCUwcU0mltjL7oDLwlQFeUkC4vWUH3NOw8vU+8ojnM=; b=yO3MHG4wUBSop14WTSb90cW+3CgR+ieIF+ZiGCQyrz4OhEymLHbbzUYpaJSZeIW6/a OBFDtWS5MK3BpozaLnXSJkDopyCUCOhCE+l8D5z6Ku3glg13Mj8BcWqQQ3oh3RnymgfM 0y9J/eB+931x5KPD73AGBxGcL4O4N60B/u9gvioVz2fRtl+l8RJfIgdHEHTtGuMHLKcE MNzT+/vIWBLCAIz3NM0fPkHnNCDMGj7V2Jv0NONjWNSacssESCaxGhMnQCfgmZxuEAd0 e0KgRhtsakG9byjVn7w28TbeUTTyedASZptmUwwGNZEknv90f+7/OwjoRQX9GZpkgReY WYQw== 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=bJCUwcU0mltjL7oDLwlQFeUkC4vWUH3NOw8vU+8ojnM=; b=hkbD/+uDaFz/l8p7L+c60JOlE6lC707Qju8MWFc+jFIQiYyhbdr6UHObzJ38xB1hVh iqW2xAP3G8fsKYQUEg9mJdRSesy22yWVbRtBauZHGfTKoAg47cDr1SLWgQCL900RAidW lQ79jHy0Vzzw1eas4CR/e12c5cLDq1bwdc8SuEglMUTuHMGeyacMtytX1DAMOdyQTd7B u1TxHn1JoUuGU1MsamuCMfhnAkLCnH311HF+P0G4swKosNihD5X9DHg16/+nToaC7P7S KJLJgmtzjsEE5Z2OcHT20CRcRqxKz+11ffTSOc6HB+xTiyXMW4rcBZRC8uSKtDlDU3n5 d9jg== X-Gm-Message-State: ALyK8tKxYTUhCjvtYx2hib566BUxdlGl9JY8YX0zV7KCDqmxcLX+EdwR5zOuiD0vs8Pvj4PS6Blql7GqQxCvWjuE X-Received: by 10.200.46.124 with SMTP id s57mr23261675qta.2.1467029330318; Mon, 27 Jun 2016 05:08:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.8.3 with HTTP; Mon, 27 Jun 2016 05:08:30 -0700 (PDT) From: Murtuza Zabuawala Date: Mon, 27 Jun 2016 17:38:30 +0530 Message-ID: Subject: PATCH: Fix the issue for saving query output as CSV To: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a11409f261c9f310536416274 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 --001a11409f261c9f310536416274 Content-Type: multipart/alternative; boundary=001a11409f261c9f2d0536416272 --001a11409f261c9f2d0536416272 Content-Type: text/plain; charset=UTF-8 Hi, PFA patch to fix the issue for downloading query output as CSV not working in Firefox & IE. Also fixes the issue that HTML tags were also appended in columns title in CSV header. Browser side fix for -> RM#1405 -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a11409f261c9f2d0536416272 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue for down= loading query output as CSV not working in Firefox & IE.
Also= fixes the issue that HTML tags were also appended in columns title in CSV = header.

Browser side fix for -> RM#1405

--
Regar= ds,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The Enterprise P= ostgreSQL Company
--001a11409f261c9f2d0536416272-- --001a11409f261c9f310536416274 Content-Type: application/octet-stream; name="RM_1405.patch" Content-Disposition: attachment; filename="RM_1405.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ipxzaqay0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci90ZW1w bGF0ZXMvc3FsZWRpdG9yL2pzL3NxbGVkaXRvci5qcyBiL3dlYi9wZ2FkbWlu L3Rvb2xzL3NxbGVkaXRvci90ZW1wbGF0ZXMvc3FsZWRpdG9yL2pzL3NxbGVk aXRvci5qcwppbmRleCBjMjI4MmExLi5iMGNhNTQxIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvdGVtcGxhdGVzL3NxbGVkaXRv ci9qcy9zcWxlZGl0b3IuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3Fs ZWRpdG9yL3RlbXBsYXRlcy9zcWxlZGl0b3IvanMvc3FsZWRpdG9yLmpzCkBA IC0yNTcxLDcgKzI1NzEsNyBAQCBkZWZpbmUoCiAgICAgICAgICAgICAgICAg a2V5cyA9IF8ucGx1Y2soc2VsZi5jb2x1bW5zLCAnbmFtZScpOwogCiAgICAg ICAgICAgICAvLyBGZXRjaCB0aGUgaXRlbXMgZnJvbSBmdWxsQ29sbGVjdGlv biBhbmQgY29udmVydCBpdCBhcyBjc3YgZm9ybWF0Ci0gICAgICAgICAgICB2 YXIgY3N2ID0gbGFiZWxzLmpvaW4oJywnKSArICdcbic7CisgICAgICAgICAg ICB2YXIgY3N2ID0ga2V5cy5qb2luKCcsJykgKyAnXG4nOwogICAgICAgICAg ICAgY3N2ICs9IGNvbGwubWFwKGZ1bmN0aW9uKGl0ZW0pIHsKICAgICAgICAg ICAgICAgICByZXR1cm4gXy5tYXAoa2V5cywgZnVuY3Rpb24oa2V5KSB7CiAg ICAgICAgICAgICAgICAgICB2YXIgY2VsbCA9IGNzdl9jb2wgW2tleV0uY2Vs bCwKQEAgLTI1ODMsMTEgKzI1ODMsNiBAQCBkZWZpbmUoCiAgICAgICAgICAg ICAgICAgfSkuam9pbignLCcpOwogICAgICAgICAgICAgfSkuam9pbignXG4n KTsKIAotICAgICAgICAgICAgLy8gRG93bmxvYWQgdGhlIGZpbGUuCi0gICAg ICAgICAgICB2YXIgZW5jb2RlZFVyaSA9IGVuY29kZVVSSSgnZGF0YTp0ZXh0 L2NzdjtjaGFyc2V0PXV0Zi04LCcgKyBjc3YpLAotICAgICAgICAgICAgICAg ICAgICBsaW5rID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYScpOwotICAg ICAgICAgICAgbGluay5zZXRBdHRyaWJ1dGUoJ2hyZWYnLCBlbmNvZGVkVXJp KTsKLQogICAgICAgICAgICAgLyogSWYgZG93bmxvYWQgaXMgZnJvbSB2aWV3 IGRhdGEgdGhlbiBmaWxlIG5hbWUgc2hvdWxkIGJlCiAgICAgICAgICAgICAg KiB0aGUgb2JqZWN0IG5hbWUgZm9yIHdoaWNoIGRhdGEgaXMgdG8gYmUgZGlz cGxheWVkLgogICAgICAgICAgICAgICovCkBAIC0yNTk4LDggKzI1OTMsNyBA QCBkZWZpbmUoCiAgICAgICAgICAgICAgICAgc3VjY2VzczogZnVuY3Rpb24o cmVzKSB7CiAgICAgICAgICAgICAgICAgICBpZiAocmVzLmRhdGEuc3RhdHVz KSB7CiAgICAgICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gcmVzLmRhdGEu cmVzdWx0ICsgJy5jc3YnOwotICAgICAgICAgICAgICAgICAgICBsaW5rLnNl dEF0dHJpYnV0ZSgnZG93bmxvYWQnLCBmaWxlbmFtZSk7Ci0gICAgICAgICAg ICAgICAgICAgIGxpbmsuY2xpY2soKTsKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5fc2F2ZV9jc3ZfZmlsZShjc3YsIGZpbGVuYW1lKTsKICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ICAgIGVycm9yOiBmdW5jdGlvbihlKSB7CkBAIC0yNjIyLDE0ICsyNjE2LDMy IEBAIGRlZmluZSgKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAg ICB2YXIgY3VyX3RpbWUgPSBuZXcgRGF0ZSgpOwogICAgICAgICAgICAgICB2 YXIgZmlsZW5hbWUgPSAnZGF0YS0nICsgY3VyX3RpbWUuZ2V0VGltZSgpICsg Jy5jc3YnOwotICAgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgnZG93 bmxvYWQnLCBmaWxlbmFtZSk7Ci0gICAgICAgICAgICAgIGxpbmsuY2xpY2so KTsKKyAgICAgICAgICAgICAgc2VsZi5fc2F2ZV9jc3ZfZmlsZShjc3YsIGZp bGVuYW1lKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAgICAgICAg ICAgZWxzZSB7CiAgICAgICAgICAgICBhbGVydGlmeS5hbGVydCgnRG93bmxv YWQgRGF0YScsICdObyBkYXRhIGlzIGF2YWlsYWJsZSB0byBkb3dubG9hZCcp OwogICAgICAgICAgIH0KICAgICAgICAgfSwKKyAgICAgICAgLy8gV2Ugd2ls bCB1c2UgdGhpcyBmdW5jdGlvbiB0byBzYXZlIHRoZSBmaWxlIGFjcm9zcyBi cm93c2VyCisgICAgICAgIF9zYXZlX2Nzdl9maWxlOiBmdW5jdGlvbihjc3ZE YXRhLCBmaWxlbmFtZSkgeworICAgICAgICAgICAgdmFyIGJsb2IgPSBuZXcg QmxvYihbY3N2RGF0YV0sIHsgdHlwZTogJ3RleHQvY3N2O2NoYXJzZXQ9dXRm LTg7JyB9KTsKKyAgICAgICAgICAgIGlmIChuYXZpZ2F0b3IubXNTYXZlQmxv YikgeyAvLyBJRSAxMCsKKyAgICAgICAgICAgICAgICBuYXZpZ2F0b3IubXNT YXZlQmxvYihibG9iLCBmaWxlbmFtZSk7CisgICAgICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgICAgIHZhciBsaW5rID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiYSIpOworICAgICAgICAgICAgICAgIGlmIChsaW5rLmRvd25s b2FkICE9PSB1bmRlZmluZWQpIHsgLy8gZmVhdHVyZSBkZXRlY3Rpb24KKyAg ICAgICAgICAgICAgICAgICAgLy8gQnJvd3NlcnMgdGhhdCBzdXBwb3J0IEhU TUw1IGRvd25sb2FkIGF0dHJpYnV0ZQorICAgICAgICAgICAgICAgICAgICB2 YXIgdXJsID0gVVJMLmNyZWF0ZU9iamVjdFVSTChibG9iKTsKKyAgICAgICAg ICAgICAgICAgICAgbGluay5zZXRBdHRyaWJ1dGUoImhyZWYiLCB1cmwpOwor ICAgICAgICAgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiZG93bmxv YWQiLCBmaWxlbmFtZSk7CisgICAgICAgICAgICAgICAgICAgIGxpbmsuc3R5 bGUudmlzaWJpbGl0eSA9ICdoaWRkZW4nOworICAgICAgICAgICAgICAgICAg ICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGxpbmspOworICAgICAgICAg ICAgICAgICAgICBsaW5rLmNsaWNrKCk7CisgICAgICAgICAgICAgICAgICAg IGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQobGluayk7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9LAogCiAgICAgICAg IF9hdXRvX3JvbGxiYWNrOiBmdW5jdGlvbigpIHsKICAgICAgICAgICB2YXIg c2VsZiA9IHRoaXM7Cg== --001a11409f261c9f310536416274 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 --001a11409f261c9f310536416274--