Slightly update Macrostrat database utils to better work with non-Pos…

…tgreSQL query running
UW-Macrostrat · Sep 12, 2024 · 58753a1 · 58753a1
1 parent abc997c
commit 58753a1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 29 deletions.
diff --git a/database/macrostrat/database/utils.py b/database/macrostrat/database/utils.py
@@ -333,9 +333,10 @@ def _should_raise_query_error(err):
         return True
 
     # If we cancel statements midstream, we should raise the error.
-    # We might want to change this behavior in the future.
+    # We might want to change this behavior in the future, or support more graceful handling of errors from other
+    # database backends.
     # Ideally we could handle operational errors more gracefully
-    if isinstance(orig_err, psycopg2.errors.QueryCanceled) or orig_err.pgcode == "57014":
+    if isinstance(orig_err, psycopg2.errors.QueryCanceled) or getattr(orig_err, "pgcode", None) == "57014":
         return True
 
     return False

diff --git a/database/pyproject.toml b/database/pyproject.toml
@@ -3,7 +3,7 @@ authors = ["Daven Quinn <[email protected]>"]
 description = "A SQLAlchemy-based database toolkit."
 name = "macrostrat.database"
 packages = [{ include = "macrostrat" }]
-version = "3.3.2"
+version = "3.3.3"
 
 [tool.poetry.dependencies]
 GeoAlchemy2 = "^0.14.0"

diff --git a/dinosaur/poetry.lock b/dinosaur/poetry.lock
diff --git a/package-tools/poetry.lock b/package-tools/poetry.lock
diff --git a/poetry.lock b/poetry.lock