macrostrat.database 3.3.3__tar.gz → 3.4.1__tar.gz

{macrostrat_database-3.3.3 → macrostrat_database-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: macrostrat.database
-Version: 3.3.3
+Version: 3.4.1
 Summary: A SQLAlchemy-based database toolkit.
 Author: Daven Quinn
 Author-email: dev@davenquinn.com
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: GeoAlchemy2 (>=0.14.0,<0.15.0)
+Requires-Dist: GeoAlchemy2 (>=0.15.2,<0.16.0)
 Requires-Dist: SQLAlchemy (>=2.0.18,<3.0.0)
 Requires-Dist: SQLAlchemy-Utils (>=0.41.1,<0.42.0)
 Requires-Dist: aiofiles (>=23.2.1,<24.0.0)
@@ -19,4 +19,4 @@ Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: macrostrat.utils (>=1.0.0,<2.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.6,<3.0.0)
 Requires-Dist: rich (>=13.7.1,<14.0.0)
-Requires-Dist: sqlparse (>=0.4.4,<0.5.0)
+Requires-Dist: sqlparse (>=0.5.1,<0.6.0)

{macrostrat_database-3.3.3 → macrostrat_database-3.4.1}/macrostrat/database/__init__.py

@@ -1,19 +1,17 @@
 import warnings
 from contextlib import contextmanager
-from enum import Enum
 from pathlib import Path
 from typing import Optional, Union
 
 from psycopg2.errors import InvalidSavepointSpecification
 from psycopg2.sql import Identifier
-from sqlalchemy import URL, MetaData, create_engine, inspect, text
+from sqlalchemy import URL, MetaData, create_engine, inspect, Engine
 from sqlalchemy.exc import IntegrityError, InternalError
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.orm import Session, scoped_session, sessionmaker
 from sqlalchemy.sql.expression import Insert
 
 from macrostrat.utils import get_logger
-
 from .mapper import DatabaseMapper
 from .postgresql import on_conflict, prefix_inserts  # noqa
 from .utils import (  # noqa
@@ -41,14 +39,14 @@ class Database(object):
 
     __inspector__ = None
 
-    def __init__(self, db_conn: Union[str, URL], *, echo_sql=False, **kwargs):
+    def __init__(self, db_conn: Union[str, URL, Engine], *, echo_sql=False, **kwargs):
         """
         Wrapper for interacting with a database using SQLAlchemy.
         Optimized for use with PostgreSQL, but usable with SQLite
         as well.
 
         Args:
-            db_conn (str): Connection string for the database.
+            db_conn (str | URL | Engine): Connection string or engine for the database.
 
         Keyword Args:
             echo_sql (bool): If True, will echo SQL commands to the
@@ -61,8 +59,12 @@ class Database(object):
 
         self.instance_params = kwargs.pop("instance_params", {})
 
-        log.info(f"Setting up database connection '{db_conn}'")
-        self.engine = create_engine(db_conn, echo=echo_sql, **kwargs)
+        if isinstance(db_conn, Engine):
+            log.info(f"Set up database connection with engine {db_conn.url}")
+            self.engine = db_conn
+        else:
+            log.info(f"Setting up database connection with URL '{db_conn}'")
+            self.engine = create_engine(db_conn, echo=echo_sql, **kwargs)
         self.metadata = kwargs.get("metadata", metadata)
 
         # Scoped session for database

{macrostrat_database-3.3.3 → macrostrat_database-3.4.1}/pyproject.toml

@@ -3,17 +3,17 @@ authors = ["Daven Quinn <dev@davenquinn.com>"]
 description = "A SQLAlchemy-based database toolkit."
 name = "macrostrat.database"
 packages = [{ include = "macrostrat" }]
-version = "3.3.3"
+version = "3.4.1"
 
 [tool.poetry.dependencies]
-GeoAlchemy2 = "^0.14.0"
+GeoAlchemy2 = "^0.15.2"
 SQLAlchemy = "^2.0.18"
 SQLAlchemy-Utils = "^0.41.1"
 click = "^8.1.3"
 "macrostrat.utils" = "^1.0.0"
 psycopg2-binary = "^2.9.6"
 python = "^3.8"
-sqlparse = "^0.4.4"
+sqlparse = "^0.5.1"
 aiofiles = "^23.2.1"
 rich = "^13.7.1"