Changes in github workflows to install postgis extension

Fixed typo in github workflow

Fixing issue in github workflow when installing postgis

Fixed issue in workflow

Removed postgis for testing

checking for logs

Testing

changes in github workflows file to add postgis and review comments

changes in github workflows file to add postgis and review comments

Author: pravesh-sharma

.github/workflows/run-python-tests-epas.yml

@@ -48,7 +48,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-postgis34
 
       - name: Install pgagent on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
@@ -105,6 +105,10 @@ jobs:
       - name: Create pgagent extension on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
         run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+      
+      - name: Create postgis extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
 
       - name: Install Python dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}

.github/workflows/run-python-tests-pg.yml

@@ -51,7 +51,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent postgresql-${{ matrix.pgver }}-postgis-3
 
       - name: Install platform dependencies on macOS
         if: ${{ matrix.os == 'macos-latest' }}
@@ -113,6 +113,7 @@ jobs:
 
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION postgis;'
 
       - name: Start PostgreSQL on macOS
         if: ${{ matrix.os == 'macos-latest' }}

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

@@ -133,8 +133,6 @@ def column_formatter(conn, tid, clid, data, edit_types_list=None,
     # Fetch length and precision
     data = fetch_length_precision(data)
 
-    data = fetch_geometry_details(data)
-
     # We need to fetch inherited tables for each table
     is_error, errmsg = _fetch_inherited_tables(
         tid, data, fetch_inherited_tables, template_path, conn)
@@ -451,19 +449,24 @@ def fetch_length_precision(data):
     data['attlen'] = None
     data['attprecision'] = None
 
+    match_obj = fetch_length_precision_details(fulltype, data)
+
     # If we have length & precision both
     if length and precision:
-        match_obj = re.search(r'(\d+),(\d+)', fulltype)
         if match_obj:
             data['attlen'] = match_obj.group(1)
-            data['attprecision'] = match_obj.group(2)
+            data['attprecision'] = match_obj.group(3)
     elif length:
         # If we have length only
-        match_obj = re.search(r'(\d+)', fulltype)
         if match_obj:
             data['attlen'] = match_obj.group(1)
             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
 
 
@@ -477,10 +480,19 @@ def parse_column_variables(col_variables):
     return spcoptions
 
 
-def fetch_geometry_details(data):
-    if 'typname' in data and (data['typname'] in ('geometry', 'geography')):
-        match_obj = re.search(r'([a-zA-Z]+),(\d+)', data['cltype'])
-        if match_obj:
-            data['geometry'] = match_obj.group(1)
-            data['srid'] = match_obj.group(2)
-    return data
+def fetch_length_precision_details(fulltype, data):
+    """
+    This function will fetch length and precision details
+    from fulltype.
+
+    :param fulltype: Full type.
+    :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

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

@@ -657,9 +657,7 @@ def is_postgis_present(self):
                                              self.server['port'],
                                              self.server['sslmode'])
         pg_cursor = connection.cursor()
-        pg_cursor.execute('''SELECT COUNT(*) FROM pg_extension WHERE
-                            extname='postgis' ''')
-        res = pg_cursor.fetchone()
+        res = utils.check_extension_exists(pg_cursor, 'postgis')
         connection.close()
         if res and len(res) > 0 and int(res[0]) == 1:
             return True

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

@@ -18,6 +18,7 @@
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.driver import get_driver
+from pgadmin.utils import check_extension_exists
 from config import PG_DEFAULT_DRIVER
 from pgadmin.utils.constants import DATATYPE_TIME_WITH_TIMEZONE,\
     DATATYPE_TIME_WITHOUT_TIMEZONE,\
@@ -194,8 +195,7 @@ def get_types(self, conn, condition, add_serials=False, schema_oid=''):
 
     def get_geometry_types(self, conn):
         types = []
-        sql = "SELECT * FROM pg_extension WHERE extname = 'postgis';"
-        status, res = conn.execute_scalar(sql)
+        status, res = check_extension_exists(conn, 'postgis')
         if not status:
             return status, res
         if res:

web/pgadmin/utils/__init__.py

@@ -984,3 +984,9 @@ def get_safe_post_logout_redirect():
         if url.startswith(item):
             return url
     return url_for('security.login')
+
+
+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

web/regression/python_test_utils/test_utils.py

@@ -1885,3 +1885,10 @@ def module_patch(*args):
 
     # did not find a module, just return the default mock
     return mock.patch(*args)
+
+
+def check_extension_exists(cursor, extension_name):
+    cursor.execute(f"""SELECT COUNT(*) FROM pg_extension
+                   WHERE extname='{extension_name}'""")
+    res = cursor.fetchone()
+    return res