Encorporated review comments

Author: pravesh-sharma

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py

@@ -449,24 +449,25 @@ def fetch_length_precision(data):
     data['attlen'] = None
     data['attprecision'] = None
 
-    match_obj = fetch_length_precision_details(fulltype, data)
+    if 'typname' in data and (data['typname'] in ('geometry', 'geography')):
+        # If we have geometry column
+        parmas = parse_params(data['cltype'])
+        data['geometry'] = parmas[0]
+        data['srid'] = parmas[1]
+    else:
+        parmas = parse_params(fulltype)
 
     # If we have length & precision both
     if length and precision:
-        if match_obj:
-            data['attlen'] = match_obj.group(1)
-            data['attprecision'] = match_obj.group(3)
+        if parmas:
+            data['attlen'] = parmas[0]
+            data['attprecision'] = parmas[1]
     elif length:
         # If we have length only
-        if match_obj:
-            data['attlen'] = match_obj.group(1)
+        if parmas:
+            data['attlen'] = parmas[0]
             data['attprecision'] = None
 
-    # If we have geometry column
-    if 'typname' in data and (data['typname'] in ('geometry', 'geography')):
-        data['geometry'] = match_obj.group(2)
-        data['srid'] = match_obj.group(3)
-
     return data
 
 
@@ -480,7 +481,7 @@ def parse_column_variables(col_variables):
     return spcoptions
 
 
-def fetch_length_precision_details(fulltype, data):
+def parse_params(fulltype):
     """
     This function will fetch length and precision details
     from fulltype.
@@ -489,10 +490,6 @@ def fetch_length_precision_details(fulltype, data):
     :param data: Data.
     """
 
-    match_obj = None
-    regex = r'\((\d*)([a-zA-Z]*),?(\d*)\)'
-    if data['typname'] in ('geometry', 'geography'):
-        match_obj = re.search(regex, data['cltype'])
-    else:
-        match_obj = re.search(regex, fulltype)
-    return match_obj
+    match_obj = re.search(r'\((\d*[a-zA-Z]*),?(\d*)\)', fulltype)
+
+    return [match_obj.group(1), match_obj.group(2)]

web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py

@@ -195,10 +195,10 @@ def get_types(self, conn, condition, add_serials=False, schema_oid=''):
 
     def get_geometry_types(self, conn):
         types = []
-        status, res = check_extension_exists(conn, 'postgis')
-        if not status:
-            return status, res
-        if res:
+        extension_exists = check_extension_exists(conn, 'postgis')
+        if not extension_exists:
+            return extension_exists, None
+        if extension_exists:
             sql = '''SELECT postgis_typmod_type(i) FROM
             generate_series(4, 63) AS i;'''
             status, rset = conn.execute_2darray(sql)

web/pgadmin/utils/__init__.py

@@ -989,4 +989,11 @@ def get_safe_post_logout_redirect():
 def check_extension_exists(conn, extension_name):
     sql = f"SELECT * FROM pg_extension WHERE extname = '{extension_name}'"
     status, res = conn.execute_scalar(sql)
-    return status, res
+    if status:
+        if res:
+            return True
+        else:
+            return False
+    else:
+        # If the query fails, we assume the extension does not exist
+        return False