IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where base types are not displaying in the create/edit domain dialog, also corrected the condition to show hidden system types. Fixes #2692

Browse Source
This commit is contained in:
Murtuza Zabuawala 2017-09-13 09:52:16 +01:00 committed by Dave Page
parent 120dbcc7d8
commit 5891bda06a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
View File

@ -493,7 +493,8 @@ AND relname = typname AND relkind != 'c') AND
relnamespace=typnamespace AND relname = substring(typname FROM 2)::name relnamespace=typnamespace AND relname = substring(typname FROM 2)::name
AND relkind != 'c'))""" AND relkind != 'c'))"""
if self.blueprint.show_system_objects: # To show hidden objects
if not self.blueprint.show_system_objects:
condition += " AND nsp.nspname != 'information_schema'" condition += " AND nsp.nspname != 'information_schema'"
# Get Types # Get Types

10
web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py
View File

@ -93,6 +93,16 @@ class DataTypeReader:
""" """
res = [] res = []
try: try:
# Check if template path is already set or not
# if not then we will set the template path here
if not hasattr(self, 'data_type_template_path'):
self.data_type_template_path = 'datatype/sql/' + (
'#{0}#{1}#'.format(
self.manager.server_type,
self.manager.version
) if self.manager.server_type == 'gpdb' else
'#{0}#'.format(self.manager.version)
)
SQL = render_template( SQL = render_template(
"/".join([self.data_type_template_path,'get_types.sql']), "/".join([self.data_type_template_path,'get_types.sql']),