Attempt to fix tests

Author: davenquinn

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

@@ -1,5 +1,6 @@
+from macrostrat.database import Database, Identifier
+
 from macrostrat.core.migrations import Migration, _not, custom_type_exists
-from macrostrat.database import Database
 
 
 def ingest_type_exists_in_wrong_schema(db: Database) -> bool:
@@ -8,6 +9,9 @@ def ingest_type_exists_in_wrong_schema(db: Database) -> bool:
     return any(conditions)
 
 
+_schemas = ["macrostrat_backup", "macrostrat", "public"]
+
+
 class MapsIngestStateCustomTypeMigration(Migration):
     name = "ingest-state-type"
     subsystem = "maps"
@@ -21,21 +25,23 @@ class MapsIngestStateCustomTypeMigration(Migration):
     postconditions = [
         custom_type_exists("maps", "ingest_state"),
         custom_type_exists("maps", "ingest_type"),
-        _not(custom_type_exists("public", "ingest_state")),
-        _not(custom_type_exists("public", "ingest_type")),
-        _not(custom_type_exists("macrostrat", "ingest_state")),
-        _not(custom_type_exists("macrostrat", "ingest_type")),
+        *(_not(custom_type_exists(schema, "ingest_state")) for schema in _schemas),
+        *(_not(custom_type_exists(schema, "ingest_type")) for schema in _schemas),
     ]
 
     preconditions = [ingest_type_exists_in_wrong_schema]
 
     def apply(self, db: Database):
         # Handle edge case where the MariaDB migration has already been applied
-        db.run_sql("ALTER TYPE macrostrat_backup.ingest_state SET SCHEMA macrostrat")
-        db.run_sql("ALTER TYPE macrostrat.ingest_state SET SCHEMA maps")
-
-        db.run_sql("ALTER TYPE macrostrat_backup.ingest_type SET SCHEMA macrostrat")
-        db.run_sql("ALTER TYPE macrostrat.ingest_type SET SCHEMA maps")
 
-        db.run_sql("ALTER TYPE public.ingest_state SET SCHEMA maps")
-        db.run_sql("ALTER TYPE public.ingest_type SET SCHEMA maps")
+        for schema in ["macrostrat_backup", "macrostrat", "public"]:
+            db.run_sql(
+                """
+                ALTER TYPE {schema}.ingest_state SET SCHEMA maps;
+                ALTER TYPE {schema}.ingest_type SET SCHEMA maps;
+
+                DROP TYPE IF EXISTS {schema}.ingest_state;
+                DROP TYPE IF EXISTS {schema}.ingest_type;
+            """,
+                dict(schema=Identifier(schema)),
+            )