Move schema_initialized() into common parent class

Author: omad

cubedash/index/api.py

@@ -7,11 +7,11 @@
 from datacube.index import Index
 from datacube.model import Dataset, MetadataType, Product, Range
 from datacube.model.fields import Field
-from sqlalchemy import CursorResult, Result, Row, Select
+from sqlalchemy import CursorResult, Result, Row, Select, inspect
 from sqlalchemy.sql import ColumnElement
 from sqlalchemy.sql.elements import ClauseElement, Label
 
-from cubedash.summary._schema import PleaseRefresh
+from cubedash.summary._schema import CUBEDASH_SCHEMA, PleaseRefresh
 
 
 class EmptyDbError(Exception):
@@ -215,8 +215,8 @@ def spatial_select_query(
     @abstractmethod
     def select_spatial_stats(self) -> Result: ...
 
-    @abstractmethod
-    def schema_initialised(self) -> bool: ...
+    def schema_initialised(self) -> bool:
+        return inspect(self.engine).has_schema(CUBEDASH_SCHEMA)
 
     @abstractmethod
     def schema_compatible_info(

cubedash/index/postgis/_api.py

@@ -815,14 +815,6 @@ def select_spatial_stats(self):
                 )
             )
 
-    @override
-    def schema_initialised(self) -> bool:
-        """
-        Do our DB schemas exist?
-        """
-        with self.engine.begin() as conn:
-            return _schema.has_schema(conn)
-
     @override
     def schema_compatible_info(self, for_writing_operations_too=False):
         """

cubedash/index/postgres/_api.py

@@ -881,14 +881,6 @@ def select_spatial_stats(self):
                 )
             )
 
-    @override
-    def schema_initialised(self) -> bool:
-        """
-        Do our DB schemas exist?
-        """
-        with self.engine.begin() as conn:
-            return _schema.has_schema(conn)
-
     @override
     def schema_compatible_info(
         self, for_writing_operations_too=False