IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-24 09:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the query tool unable to load the file which contains the BOM marker. Fixes #3495

Browse Source
This commit is contained in:
Murtuza Zabuawala 2020-04-17 12:40:09 +05:30 committed by Akshay Joshi
parent 0ce4f49e08
commit d35433d0b8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_21.rst
View File

@ -26,6 +26,7 @@ Bug fixes
********* *********
| `Issue #2813 <https://redmine.postgresql.org/issues/2813>`_ - Ensure that the password prompt should not be visible if the database server is in trust authentication mode. | `Issue #2813 <https://redmine.postgresql.org/issues/2813>`_ - Ensure that the password prompt should not be visible if the database server is in trust authentication mode.
| `Issue #3495 <https://redmine.postgresql.org/issues/3495>`_ - Fixed an issue where the query tool unable to load the file which contains the BOM marker.
| `Issue #3523 <https://redmine.postgresql.org/issues/3523>`_ - Fixed an issue where right-clicking a browser object does not apply to the object on which right-click was fired. | `Issue #3523 <https://redmine.postgresql.org/issues/3523>`_ - Fixed an issue where right-clicking a browser object does not apply to the object on which right-click was fired.
| `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job. | `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job.
| `Issue #3947 <https://redmine.postgresql.org/issues/3947>`_ - Fixed copy-paste row issues in View/Edit Data. | `Issue #3947 <https://redmine.postgresql.org/issues/3947>`_ - Fixed copy-paste row issues in View/Edit Data.

7
web/pgadmin/misc/file_manager/__init__.py
View File

@ -1089,8 +1089,11 @@ class Filemanager(object):
is_startswith_bom = True is_startswith_bom = True
enc = encoding enc = encoding
# Check if string is binary # No need to check for binary file, a BOM marker already
is_binary = is_binary_string(file_data) # indicates that text stream afterwards
if not is_startswith_bom:
# Check if string is binary
is_binary = is_binary_string(file_data)
except IOError as ex: except IOError as ex:
status = False status = False