mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fix handling of backslashes in the edit grid. Fixes #3551
This commit is contained in:
parent
530017809a
commit
15fe26a710
@ -18,6 +18,7 @@ Bug fixes
|
|||||||
*********
|
*********
|
||||||
|
|
||||||
| `Bug #3464 <https://redmine.postgresql.org/issues/3464>`_ - Ensure the runtime can startup properly if there are wide characters in the logfile path on Windows.
|
| `Bug #3464 <https://redmine.postgresql.org/issues/3464>`_ - Ensure the runtime can startup properly if there are wide characters in the logfile path on Windows.
|
||||||
|
| `Bug #3551 <https://redmine.postgresql.org/issues/3551>`_ - Fix handling of backslashes in the edit grid.
|
||||||
| `Bug #3576 <https://redmine.postgresql.org/issues/3576>`_ - Ensure queries are no longer executed when dashboards are closed.
|
| `Bug #3576 <https://redmine.postgresql.org/issues/3576>`_ - Ensure queries are no longer executed when dashboards are closed.
|
||||||
| `Bug #3596 <https://redmine.postgresql.org/issues/3596>`_ - Fix support for the CLOB datatype in EPAS.
|
| `Bug #3596 <https://redmine.postgresql.org/issues/3596>`_ - Fix support for the CLOB datatype in EPAS.
|
||||||
| `Bug #3607 <https://redmine.postgresql.org/issues/3607>`_ - Fix logic around validation and highlighting of Sort/Filter in the Query Tool.
|
| `Bug #3607 <https://redmine.postgresql.org/issues/3607>`_ - Fix logic around validation and highlighting of Sort/Filter in the Query Tool.
|
||||||
|
119
web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py
Normal file
119
web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
##########################################################################
|
||||||
|
#
|
||||||
|
# pgAdmin 4 - PostgreSQL Tools
|
||||||
|
#
|
||||||
|
# Copyright (C) 2013 - 2018, The pgAdmin Development Team
|
||||||
|
# This software is released under the PostgreSQL Licence
|
||||||
|
#
|
||||||
|
##########################################################################
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from pgadmin.utils.route import BaseTestGenerator
|
||||||
|
from regression.python_test_utils import test_utils
|
||||||
|
from pgadmin.utils import server_utils
|
||||||
|
|
||||||
|
|
||||||
|
class TestSQLASCIIEncoding(BaseTestGenerator):
|
||||||
|
"""
|
||||||
|
This class validates character support in pgAdmin4 for
|
||||||
|
SQL_ASCII encodings
|
||||||
|
"""
|
||||||
|
skip_on_database = ['gpdb']
|
||||||
|
scenarios = [
|
||||||
|
(
|
||||||
|
'Test SQL_ASCII data with multiple backslashes',
|
||||||
|
dict(
|
||||||
|
table_name='test_sql_ascii',
|
||||||
|
db_encoding='SQL_ASCII',
|
||||||
|
lc_collate='C',
|
||||||
|
test_str='\\\\Four\\\Three\\Two\One'
|
||||||
|
)),
|
||||||
|
(
|
||||||
|
'Test SQL_ASCII data with file path',
|
||||||
|
dict(
|
||||||
|
table_name='test_sql_ascii',
|
||||||
|
db_encoding='SQL_ASCII',
|
||||||
|
lc_collate='C',
|
||||||
|
test_str='\\test\Documents\2017\12\19\AD93E646-'
|
||||||
|
'E5FE-11E7-85AE-EB2E217F96F0.tif'
|
||||||
|
)),
|
||||||
|
(
|
||||||
|
'Test SQL_ASCII data with multiple forward slashes',
|
||||||
|
dict(
|
||||||
|
table_name='test_sql_ascii',
|
||||||
|
db_encoding='SQL_ASCII',
|
||||||
|
lc_collate='C',
|
||||||
|
test_str='////4///3//2/1'
|
||||||
|
)),
|
||||||
|
(
|
||||||
|
'Test SQL_ASCII data with blob string',
|
||||||
|
dict(
|
||||||
|
table_name='test_sql_ascii',
|
||||||
|
db_encoding='SQL_ASCII',
|
||||||
|
lc_collate='C',
|
||||||
|
test_str='Blob: \xf4\xa5\xa3\xa5'
|
||||||
|
)),
|
||||||
|
]
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.encode_db_name = 'test_encoding_' + self.db_encoding
|
||||||
|
self.encode_sid = self.server_information['server_id']
|
||||||
|
|
||||||
|
server_con = server_utils.connect_server(self, self.encode_sid)
|
||||||
|
if hasattr(self, 'skip_on_database'):
|
||||||
|
if 'data' in server_con and 'type' in server_con['data']:
|
||||||
|
if server_con['data']['type'] in self.skip_on_database:
|
||||||
|
self.skipTest('cannot run in: %s' %
|
||||||
|
server_con['data']['type'])
|
||||||
|
|
||||||
|
self.encode_did = test_utils.create_database(
|
||||||
|
self.server, self.encode_db_name,
|
||||||
|
(self.db_encoding, self.lc_collate))
|
||||||
|
|
||||||
|
test_utils.create_table_with_query(
|
||||||
|
self.server,
|
||||||
|
self.encode_db_name,
|
||||||
|
"""CREATE TABLE {0}(
|
||||||
|
name character varying(200) COLLATE pg_catalog."default")
|
||||||
|
""".format(self.table_name))
|
||||||
|
|
||||||
|
def runTest(self):
|
||||||
|
db_con = test_utils.get_db_connection(
|
||||||
|
self.encode_db_name,
|
||||||
|
self.server['username'],
|
||||||
|
self.server['db_password'],
|
||||||
|
self.server['host'],
|
||||||
|
self.server['port'],
|
||||||
|
self.server['sslmode']
|
||||||
|
)
|
||||||
|
|
||||||
|
old_isolation_level = db_con.isolation_level
|
||||||
|
db_con.set_isolation_level(0)
|
||||||
|
db_con.set_client_encoding(self.db_encoding)
|
||||||
|
pg_cursor = db_con.cursor()
|
||||||
|
query = """INSERT INTO {0} VALUES('{1}')""".format(
|
||||||
|
self.table_name, self.test_str)
|
||||||
|
pg_cursor.execute(query)
|
||||||
|
db_con.set_isolation_level(old_isolation_level)
|
||||||
|
db_con.commit()
|
||||||
|
|
||||||
|
query = """SELECT * FROM {0}""".format(self.table_name)
|
||||||
|
pg_cursor.execute(query)
|
||||||
|
resp = pg_cursor.fetchone()
|
||||||
|
|
||||||
|
if sys.version_info < (3,):
|
||||||
|
self.assertEqual(resp[0].encode("raw_unicode_escape"),
|
||||||
|
self.test_str)
|
||||||
|
else:
|
||||||
|
self.assertEqual(resp[0], self.test_str)
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
main_conn = test_utils.get_db_connection(
|
||||||
|
self.server['db'],
|
||||||
|
self.server['username'],
|
||||||
|
self.server['db_password'],
|
||||||
|
self.server['host'],
|
||||||
|
self.server['port'],
|
||||||
|
self.server['sslmode']
|
||||||
|
)
|
||||||
|
test_utils.drop_database(main_conn, self.encode_db_name)
|
@ -16,6 +16,7 @@ object.
|
|||||||
import random
|
import random
|
||||||
import select
|
import select
|
||||||
import sys
|
import sys
|
||||||
|
import six
|
||||||
import datetime
|
import datetime
|
||||||
from collections import deque
|
from collections import deque
|
||||||
import simplejson as json
|
import simplejson as json
|
||||||
@ -630,11 +631,18 @@ WHERE
|
|||||||
if self.conn.encoding in ('SQL_ASCII', 'SQLASCII',
|
if self.conn.encoding in ('SQL_ASCII', 'SQLASCII',
|
||||||
'MULE_INTERNAL', 'MULEINTERNAL')\
|
'MULE_INTERNAL', 'MULEINTERNAL')\
|
||||||
and params is not None and type(params) == dict:
|
and params is not None and type(params) == dict:
|
||||||
params = dict(
|
for key, val in params.items():
|
||||||
(key, val.encode('unicode_escape')
|
modified_val = val
|
||||||
.decode('raw_unicode_escape'))
|
# "unicode_escape" will convert single backslash to double
|
||||||
for key, val in params.items()
|
# backslash, so we will have to replace/revert them again
|
||||||
)
|
# to store the correct value into the database.
|
||||||
|
if isinstance(val, six.string_types):
|
||||||
|
modified_val = val.encode('unicode_escape')\
|
||||||
|
.decode('raw_unicode_escape')\
|
||||||
|
.replace("\\\\", "\\")
|
||||||
|
|
||||||
|
params[key] = modified_val
|
||||||
|
|
||||||
return params
|
return params
|
||||||
|
|
||||||
def __internal_blocking_execute(self, cur, query, params):
|
def __internal_blocking_execute(self, cur, query, params):
|
||||||
|
@ -176,12 +176,12 @@ def register_string_typecasters(connection):
|
|||||||
return None
|
return None
|
||||||
return bytes(
|
return bytes(
|
||||||
value, encodings[cursor.connection.encoding]
|
value, encodings[cursor.connection.encoding]
|
||||||
).decode('unicode_escape')
|
).decode('raw_unicode_escape')
|
||||||
else:
|
else:
|
||||||
def non_ascii_escape(value, cursor):
|
def non_ascii_escape(value, cursor):
|
||||||
if value is None:
|
if value is None:
|
||||||
return None
|
return None
|
||||||
return value.decode('unicode_escape')
|
return value.decode('raw_unicode_escape')
|
||||||
|
|
||||||
unicode_type = psycopg2.extensions.new_type(
|
unicode_type = psycopg2.extensions.new_type(
|
||||||
# "char", name, text, character, character varying
|
# "char", name, text, character, character varying
|
||||||
|
Loading…
Reference in New Issue
Block a user