Ensure that PostgREST API picks up additional lines_oriented attribute

Author: davenquinn

cli/macrostrat/cli/database/migrations/maps_lines_oriented/__init__.py

@@ -6,6 +6,8 @@
 
 from macrostrat.core.migrations import Migration, has_columns
 
+_has_column = has_columns("maps", "sources", "lines_oriented")
+
 
 class MapsLinesOriented(Migration):
     name = "maps-lines-oriented"
@@ -14,7 +16,7 @@ class MapsLinesOriented(Migration):
 
     depends_on = ["baseline"]
 
-    postconditions = [has_columns("maps", "sources", "lines_oriented")]
+    postconditions = [_has_column]
 
     def apply(self, db: Database):
         db.run_sql("ALTER TABLE maps.sources ADD COLUMN lines_oriented boolean")
@@ -41,13 +43,17 @@ def matching_sources(
 
 
 def some_maps_are_unoriented(db: Database) -> bool:
+    if not _has_column(db):
+        return False
     ids = matching_sources(
         db, valid_maps + reversed_maps, "NOT coalesce(lines_oriented, false)"
     )
     return len(ids) > 0
 
 
 def all_maps_are_oriented(db: Database) -> bool:
+    if not _has_column(db):
+        return False
     _all_maps = valid_maps + reversed_maps
     ids = matching_sources(db, _all_maps, "coalesce(lines_oriented, false)")
     return len(ids) == len(_all_maps)

…li/database/maps_api/01-maps-sources.sql …ons/maps_sources_api/01-maps-sources.sqlcli/macrostrat/cli/database/maps_api/01-maps-sources.sql renamed to cli/macrostrat/cli/database/migrations/maps_sources_api/01-maps-sources.sql cli/macrostrat/cli/database/maps_api/01-maps-sources.sql renamed to cli/macrostrat/cli/database/migrations/maps_sources_api/01-maps-sources.sql

@@ -1,10 +1,6 @@
-ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS raster_url text;
-ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS scale_denominator integer;
-ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS is_finalized boolean DEFAULT false;
-
-DROP VIEW IF EXISTS macrostrat_api.sources_metadata CASCADE;
-DROP VIEW IF EXISTS maps.sources_metadata CASCADE;
-DROP VIEW IF EXISTS macrostrat_api.sources CASCADE;
+DROP VIEW IF EXISTS macrostrat_api.sources_metadata;
+DROP VIEW IF EXISTS maps.sources_metadata;
+DROP VIEW IF EXISTS macrostrat_api.sources;
 
 CREATE OR REPLACE VIEW maps.sources_metadata AS
 SELECT
@@ -26,7 +22,8 @@ SELECT
     status_code,
     raster_url,
     scale_denominator,
-    is_finalized
+    is_finalized,
+    lines_oriented
 FROM maps.sources AS s
 ORDER BY source_id DESC;
 
@@ -89,5 +86,6 @@ SELECT
     s.raster_url,
     s.web_geom envelope,
     s.is_finalized,
-    s.scale_denominator
+    s.scale_denominator,
+    s.lines_oriented
 FROM maps.sources s;

…ostrat/cli/database/maps_api/__init__.py …/migrations/maps_sources_api/__init__.pycli/macrostrat/cli/database/maps_api/__init__.py renamed to cli/macrostrat/cli/database/migrations/maps_sources_api/__init__.py cli/macrostrat/cli/database/maps_api/__init__.py renamed to cli/macrostrat/cli/database/migrations/maps_sources_api/__init__.py

@@ -1,9 +1,9 @@
 from macrostrat.core.migrations import Migration, has_columns, view_exists
 
 
-class MapsAPIMigration(Migration):
-    name = "maps-sources"
-    subsystem = "core"
+class MapsSourcesAPIMigration(Migration):
+    name = "maps-sources-api"
+    subsystem = "maps"
     description = """
     Create views for sources_metadata and ingest_process in the maps and macrostrat_api schemas
     """
@@ -20,5 +20,6 @@ class MapsAPIMigration(Migration):
             "is_finalized",
             "scale_denominator",
             "lines_oriented",
+            allow_view=True,
         ),
     ]

core/macrostrat/core/migrations/__init__.py

@@ -7,12 +7,11 @@
 from typing import Callable, Iterable
 
 import docker
-from pydantic import BaseModel
-from rich import print
-
 from macrostrat.database import Database
 from macrostrat.database.utils import OutputMode
 from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
+from pydantic import BaseModel
+from rich import print
 
 from ..config import settings
 from ..database import get_database
@@ -58,11 +57,15 @@ def custom_type_exists(schema: str, *type_names: str) -> DbEvaluator:
     return lambda db: all(db.inspector.has_type(t, schema=schema) for t in type_names)
 
 
-def has_columns(schema: str, table: str, *fields: str) -> DbEvaluator:
+def has_columns(schema: str, table: str, *fields: str, allow_view=False) -> DbEvaluator:
     """Return a function that evaluates to true when every given field in the given table exists"""
 
     def _has_fields(db: Database) -> bool:
-        if not db.inspector.has_table(table, schema=schema):
+        _has_table = db.inspector.has_table(table, schema=schema)
+        if not _has_table and not allow_view:
+            return False
+        _has_view = table in db.inspector.get_view_names(schema)
+        if not _has_table and not _has_view:
             return False
         columns = db.inspector.get_columns(table, schema=schema)
         col_names = [c["name"] for c in columns]