drivers: remove SQLAlchemy 1.4 workaround

datacube/drivers/postgis/_core.py

@@ -13,7 +13,7 @@
 from alembic.migration import MigrationContext
 from alembic.runtime.environment import EnvironmentContext
 from alembic.script import ScriptDirectory
-from sqlalchemy import MetaData, inspect, text
+from sqlalchemy import Connection, MetaData, inspect, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.schema import CreateSchema
 from sqlalchemy.sql.ddl import DropSchema
@@ -286,10 +286,8 @@ def has_schema(engine) -> bool:
     return SCHEMA_NAME in inspector.get_schema_names()
 
 
-def drop_db(connection) -> None:
-    # if_exists parameter seems to not be working in SQLA1.4?
-    if has_schema(connection.engine):
-        connection.execute(DropSchema(SCHEMA_NAME, cascade=True, if_exists=True))
+def drop_db(connection: Connection) -> None:
+    connection.execute(DropSchema(SCHEMA_NAME, cascade=True, if_exists=True))
 
 
 def to_pg_role(role) -> str:

datacube/drivers/postgres/_core.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from sqlalchemy import MetaData, inspect, text
+from sqlalchemy import Connection, MetaData, inspect, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.schema import CreateSchema, DropSchema
 
@@ -296,10 +296,8 @@ def has_schema(engine) -> bool:
     return SCHEMA_NAME in inspector.get_schema_names()
 
 
-def drop_db(connection) -> None:
-    # if_exists parameter seems to not be working in SQLA1.4?
-    if has_schema(connection.engine):
-        connection.execute(DropSchema(SCHEMA_NAME, cascade=True, if_exists=True))
+def drop_db(connection: Connection) -> None:
+    connection.execute(DropSchema(SCHEMA_NAME, cascade=True, if_exists=True))
 
 
 def to_pg_role(role: str) -> str:

integration_tests/conftest.py

@@ -615,7 +615,6 @@ def reset_db(cfg_env: ODCEnvironment, tz=None) -> PostgresDb | PostGisDb:
 def cleanup_db(cfg_env: ODCEnvironment, db: PostgresDb | PostGisDb) -> None:
     with db._engine.connect() as connection:
         if cfg_env._name in ("datacube", "default", "postgres"):
-            # with db.begin() as c:  # Drop SCHEMA
             pgres_core.drop_db(connection)
         else:
             pgis_core.drop_db(connection)