To: pgadmin-hackers@postgresql.org
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Subject: PATCH: Minor patch to fix 'qtLiteral' function in pgAdmin4
Message-ID: <568BCB49.5060508@enterprisedb.com>
Date: Tue, 5 Jan 2016 19:25:21 +0530
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060305090309000208050304"
Precedence: bulk
Sender: pgadmin-hackers-owner@postgresql.org

This is a multi-part message in MIME format.
--------------060305090309000208050304
Content-Type: multipart/alternative;
 boundary="------------050004020103050108090401"


--------------050004020103050108090401
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

Please find minor patch to fix 'qtLiteral' function in pgAdmin4.

_Issue:_
'qtLiteral' functions returns in 'bytes' but we need to convert it in 
string for Python3.


Regards,
Murtuza Zabuawala

--------------050004020103050108090401
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: 7bit

<html>
  <head>

    <meta http-equiv="content-type" content="text/html; charset=utf-8">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    Hi,<br>
    <br>
    Please find minor patch to fix 'qtLiteral' function in pgAdmin4.<br>
    <br>
    <u>Issue:</u><br>
    'qtLiteral' functions returns in 'bytes' but we need to convert it
    in string for Python3. <br>
    <br>
    <br>
    Regards,<br>
    Murtuza Zabuawala<br>
  </body>
</html>

--------------050004020103050108090401--

--------------060305090309000208050304
Content-Type: text/x-patch;
 name="fixed_qtLiteral.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="fixed_qtLiteral.patch"

diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py
index f5346ba..c24cb77 100644
--- a/web/pgadmin/utils/driver/psycopg2/__init__.py
+++ b/web/pgadmin/utils/driver/psycopg2/__init__.py
@@ -760,7 +760,12 @@ class Driver(BaseDriver):
 
     @staticmethod
     def qtLiteral(value):
-        return adapt(value).getquoted()
+        # Returns in bytes, we need to convert it in string
+        if isinstance(adapt(value).getquoted(), bytes):
+            return adapt(value).getquoted().decode()
+        else:
+            return adapt(value).getquoted()
+
 
     @staticmethod
     def ScanKeywordExtraLookup(key):

--------------060305090309000208050304
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

--------------060305090309000208050304--