macrostrat.database 3.3.2__tar.gz → 3.3.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/PKG-INFO +1 -1
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/utils.py +3 -2
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/pyproject.toml +1 -1
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/__init__.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/mapper/__init__.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/mapper/base.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/mapper/cache.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/mapper/utils.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/postgresql.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/__init__.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/dump_database.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/move_tables.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/restore_database.py +0 -0
- {macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/utils.py +0 -0
|
@@ -333,9 +333,10 @@ def _should_raise_query_error(err):
|
|
|
333
333
|
return True
|
|
334
334
|
|
|
335
335
|
# If we cancel statements midstream, we should raise the error.
|
|
336
|
-
# We might want to change this behavior in the future
|
|
336
|
+
# We might want to change this behavior in the future, or support more graceful handling of errors from other
|
|
337
|
+
# database backends.
|
|
337
338
|
# Ideally we could handle operational errors more gracefully
|
|
338
|
-
if isinstance(orig_err, psycopg2.errors.QueryCanceled) or orig_err
|
|
339
|
+
if isinstance(orig_err, psycopg2.errors.QueryCanceled) or getattr(orig_err, "pgcode", None) == "57014":
|
|
339
340
|
return True
|
|
340
341
|
|
|
341
342
|
return False
|
|
@@ -3,7 +3,7 @@ authors = ["Daven Quinn <dev@davenquinn.com>"]
|
|
|
3
3
|
description = "A SQLAlchemy-based database toolkit."
|
|
4
4
|
name = "macrostrat.database"
|
|
5
5
|
packages = [{ include = "macrostrat" }]
|
|
6
|
-
version = "3.3.
|
|
6
|
+
version = "3.3.3"
|
|
7
7
|
|
|
8
8
|
[tool.poetry.dependencies]
|
|
9
9
|
GeoAlchemy2 = "^0.14.0"
|
|
File without changes
|
{macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/mapper/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/move_tables.py
RENAMED
|
File without changes
|
|
File without changes
|
{macrostrat_database-3.3.2 → macrostrat_database-3.3.3}/macrostrat/database/transfer/utils.py
RENAMED
|
File without changes
|