macrostrat.database 4.0.2__tar.gz → 4.1.1__tar.gz

{macrostrat_database-4.0.2 → macrostrat_database-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: macrostrat.database
-Version: 4.0.2
+Version: 4.1.1
 Summary: A SQLAlchemy-based database toolkit.
 Author: Daven Quinn
 Author-email: Daven Quinn <dev@davenquinn.com>
@@ -10,14 +10,14 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: geoalchemy2>=0.15.2,<0.16
+Requires-Dist: geoalchemy2>=0.15.2,<0.21.0
 Requires-Dist: sqlalchemy>=2.0.18,<3
-Requires-Dist: sqlalchemy-utils>=0.41.1,<0.42
+Requires-Dist: sqlalchemy-utils>=0.41.1,<0.43
 Requires-Dist: click>=8.1.3,<9
 Requires-Dist: macrostrat-utils>=1.3.3,<2
 Requires-Dist: sqlparse>=0.5.1,<0.6
-Requires-Dist: aiofiles>=23.2.1,<24
-Requires-Dist: rich>=13.7.1,<14
+Requires-Dist: aiofiles>=23.2.1,<26
+Requires-Dist: rich>=13.7.1,<16
 Requires-Dist: psycopg>=3.2.1,<4
 Requires-Dist: psycopg2>=2.9.11,<3
 Requires-Python: >=3.10, <4

{macrostrat_database-4.0.2 → macrostrat_database-4.1.1}/macrostrat/database/query.py

@@ -1,4 +1,5 @@
 import os
+import re
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
@@ -9,6 +10,10 @@ from warnings import warn
 
 import psycopg2.sql as psql2
 from click import secho
+from macrostrat.database.compat import (
+    update_legacy_identifier,
+)
+from macrostrat.utils import get_logger
 from psycopg.errors import QueryCanceled
 from psycopg.sql import SQL, Composable, Composed
 from rich.console import Console
@@ -24,11 +29,6 @@ from sqlalchemy.exc import (
 from sqlalchemy.sql.elements import TextClause
 from sqlparse import format, split
 
-from macrostrat.database.compat import (
-    update_legacy_identifier,
-)
-from macrostrat.utils import get_logger
-
 log = get_logger(__name__)
 
 
@@ -319,7 +319,7 @@ def _run_sql(connectable, sql, params=None, *, print_skipped=True, **kwargs):
         params = [params] * len(queries)
 
     for index, (query, _params) in enumerate(zip(queries, params)):
-        _query, sql_text = _render_query_text(connectable, query, _params)
+        _query, sql_text, rest_params = _render_query_text(connectable, query, _params)
         if sql_text == "":
             continue
 
@@ -349,6 +349,11 @@ def _render_query_text(connectable, query, params):
     if isinstance(query, (psql2.SQL, psql2.Composed)):
         query = update_legacy_identifier(query)
 
+    if isinstance(query, str):
+        # Escape postgresql cast parameters after SQLAlchemy binds
+        # (e.g., :param::text)
+        query = escape_postgresql_cast_parameters(query)
+
     if pre_bind_params is not None:
         if not isinstance(query, SQL):
             query = SQL(query)
@@ -360,9 +365,19 @@ def _render_query_text(connectable, query, params):
 
     sql_text = str(query)
     if isinstance(query, str):
-        sql_text = format(query, strip_comments=True).strip()
+        sql_text = format(sql_text, strip_comments=True).strip()
 
-    return query, sql_text
+    return query, sql_text, params
+
+
+def escape_postgresql_cast_parameters(sql_text):
+    regex = r":([\w]+)::([a-zA-Z]+)"
+    for res in re.findall(regex, sql_text):
+        param, cast_type = res
+        sql_text = sql_text.replace(
+            f":{param}::{cast_type}", ":" + param + r"\:\:" + cast_type
+        )
+    return sql_text
 
 
 def _execute_one(
@@ -377,7 +392,7 @@ def _execute_one(
 ):
     params = result.params
 
-    query, sql_text = _render_query_text(connectable, result.query, params)
+    query, sql_text, _params = _render_query_text(connectable, result.query, params)
     if has_server_binds is None:
         has_server_binds = infer_has_server_binds(sql_text)
 
@@ -402,11 +417,11 @@ def _execute_one(
         log.debug("Executing SQL: \n %s", query)
         if has_server_binds:
             conn = _get_connection(connectable)
-            res = conn.exec_driver_sql(query, params)
+            res = conn.exec_driver_sql(query, _params)
         else:
             if not isinstance(query, TextClause):
                 query = text(query)
-            res = connectable.execute(query, params)
+            res = connectable.execute(query, _params)
 
         yield res
 

{macrostrat_database-4.0.2 → macrostrat_database-4.1.1}/macrostrat/database/utils.py

@@ -101,7 +101,9 @@ def temp_database(conn_string, drop=True, ensure_empty=False):
     """Create a temporary database and tear it down after tests."""
     create_database(conn_string, exists_ok=True, replace=ensure_empty)
     try:
-        yield create_engine(conn_string)
+        engine = create_engine(conn_string)
+        yield engine
+        engine.dispose()
     finally:
         if drop:
             drop_database(conn_string)
@@ -149,7 +151,7 @@ def create_engine(db_conn, **kwargs):
         if isinstance(url, str):
             url = make_url(url)
         # Set the driver to psycopg if not already set
-        if url.drivername != "postgresql+psycopg":
+        if "postgres" in url.drivername:
             url = url.set(drivername="postgresql+psycopg")
 
         return base_create_engine(url, **kwargs)

{macrostrat_database-4.0.2 → macrostrat_database-4.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "macrostrat.database"
-version = "4.0.2"
+version = "4.1.1"
 description = "A SQLAlchemy-based database toolkit."
 authors = [{ name = "Daven Quinn", email = "dev@davenquinn.com" }]
 requires-python = ">=3.10,<4"
@@ -13,14 +13,14 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-    "GeoAlchemy2>=0.15.2,<0.16",
+    "GeoAlchemy2>=0.15.2,<0.21.0",
     "SQLAlchemy>=2.0.18,<3",
-    "SQLAlchemy-Utils>=0.41.1,<0.42",
+    "SQLAlchemy-Utils>=0.41.1,<0.43",
     "click>=8.1.3,<9",
     "macrostrat.utils>=1.3.3,<2",
     "sqlparse>=0.5.1,<0.6",
-    "aiofiles>=23.2.1,<24",
-    "rich>=13.7.1,<14",
+    "aiofiles>=23.2.1,<26",
+    "rich>=13.7.1,<16",
     "psycopg>=3.2.1,<4",
     "psycopg2>=2.9.11,<3",
 ]