Merge pull request #5812 from nyaruka/no_postgis

Allow running migrations without PostGIS
nyaruka · Jan 16, 2025 · 7ef4cac · 7ef4cac
2 parents b77c003 + 02a1741
commit 7ef4cac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
         ports:
           - 6379:6379
       postgres:
-        image: postgis/postgis:15-3.3-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_DB: temba
           POSTGRES_USER: temba
@@ -63,6 +63,8 @@ jobs:
           port: 6000
 
       - name: Initialize environment
+        env:
+          POSTGIS: 'OFF'
         run: |
           poetry install --no-root
           yarn install
@@ -85,6 +87,8 @@ jobs:
           poetry run python manage.py compress --extension=".html" --settings=temba.settings_compress
 
       - name: Run tests
+        env:
+          POSTGIS: 'OFF'
         run: |
           poetry run coverage run manage.py test --keepdb --noinput --verbosity=2
           poetry run coverage report -i

diff --git a/temba/locations/migrations/0031_squashed.py b/temba/locations/migrations/0031_squashed.py
@@ -36,7 +36,11 @@ class Migration(migrations.Migration):
                 ("path", models.CharField(max_length=768)),
                 (
                     "simplified_geometry",
-                    django.contrib.gis.db.models.fields.MultiPolygonField(null=True, srid=4326),
+                    (
+                        django.contrib.gis.db.models.fields.MultiPolygonField(null=True, srid=4326)
+                        if settings.POSTGIS
+                        else models.TextField()
+                    ),
                 ),
                 ("lft", models.PositiveIntegerField(editable=False)),
                 ("rght", models.PositiveIntegerField(editable=False)),

diff --git a/temba/locations/migrations/0034_populate_json_geometry.py b/temba/locations/migrations/0034_populate_json_geometry.py
@@ -1,10 +1,15 @@
 # Generated by Django 5.1.4 on 2025-01-10 14:30
+
 import geojson
 
+from django.conf import settings
 from django.db import migrations
 
 
 def populate_boundary_geometry(apps, schema_editor):  # pragma: no cover
+    if not settings.POSTGIS:
+        return
+
     AdminBoundary = apps.get_model("locations", "AdminBoundary")
 
     boundaries = AdminBoundary.objects.all().order_by("level", "osm_id")

diff --git a/temba/settings_common.py b/temba/settings_common.py
@@ -18,6 +18,9 @@
 
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 2500  # needed for exports of big workspaces
 
+# Temp workaround to allow running migrations without PostGIS
+POSTGIS = os.getenv("POSTGIS") != "OFF"
+
 # -----------------------------------------------------------------------------------
 # Tests
 # -----------------------------------------------------------------------------------
@@ -628,7 +631,7 @@
 # Database
 # -----------------------------------------------------------------------------------
 _default_database_config = {
-    "ENGINE": "django.contrib.gis.db.backends.postgis",
+    "ENGINE": "django.contrib.gis.db.backends.postgis" if POSTGIS else "django.db.backends.postgresql",
     "NAME": "temba",
     "USER": "temba",
     "PASSWORD": "temba",