dinao 2.2.0.dev174__tar.gz → 2.2.0.dev178__tar.gz

{dinao-2.2.0.dev174/dinao.egg-info → dinao-2.2.0.dev178}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dinao
-Version: 2.2.0.dev174
+Version: 2.2.0.dev178
 Summary: A simple database API
 Author-email: Jim Carreer <jim.carreer+dinao@gmail.com>
 License-Expression: ISC

dinao-2.2.0.dev178/dinao/__version__.py

@@ -0,0 +1,2 @@
+# noqa: D100
+__version__ = "2.2.0.dev178"

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/backend/__init__.py

@@ -94,9 +94,11 @@ def create_connection_pool(db_url: str) -> ConnectionPoolBase:
         if mode == "async":
             return AsyncConnectionPoolPSQLPsycopg3(db_url)
         return ConnectionPoolPSQLPsycopg3(db_url)
-    if backend == "sqlite3" and engine is None:
+    if backend == "sqlite3":
         if mode == "async":
             raise UnsupportedBackendError("The sqlite3 backend does not support async mode")
+        if engine is not None:
+            raise UnsupportedBackendError(f"The backend+engine '{scheme}' is not supported")
         return ConnectionPoolSQLite3(db_url)
     if backend == "mariadb" and engine == "mariadbconnector":
         if mode == "async":

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/backend/postgres/asyncpg.py

@@ -214,7 +214,7 @@ class AsyncConnectionPoolPSQLAsyncpg(AsyncConnectionPoolPSQL):
         if self._pool is not None:
             return
         async with self._pool_lock:
-            if self._pool is not None:
+            if self._pool is not None:  # pragma: no cover
                 return
             import asyncpg
 

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/binding/binders/async_.py

@@ -14,7 +14,7 @@ from dinao.binding.binders.base import (
     BoundTransactionBase,
     FunctionBinderBase,
 )
-from dinao.binding.errors import CannotInferMappingError, NoPoolSetError, TooManyRowsError
+from dinao.binding.errors import CannotInferMappingError, IncompatibleBindingError, NoPoolSetError, TooManyRowsError
 from dinao.binding.mappers import ASYNC_GENERATOR_GENERICS, GENERATOR_GENERICS
 
 
@@ -26,6 +26,19 @@ class AsyncFunctionBinder(FunctionBinderBase):
         super().__init__()
         self._context_store = contextvars.ContextVar("active_cnx", default=None)
 
+    def _validate_function(self, func):
+        """Validate that the function is a coroutine.
+
+        :raises IncompatibleBindingError
+        """
+        if not inspect.iscoroutinefunction(func):
+            error = (
+                f"AsyncFunctionBinder cannot bind sync function"
+                f" '{func.__name__}'; use FunctionBinder"
+                f" for sync functions"
+            )
+            self._suppressed_raise(IncompatibleBindingError(error))
+
     def _validate_pool(self, pool):
         """Validate that the pool is an async pool.
 

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/binding/binders/base.py

@@ -69,6 +69,10 @@ class FunctionBinderBase(ABC):
         """Validate a pool before assignment. Override in subclasses for type checking."""
         pass
 
+    def _validate_function(self, func):
+        """Validate a function before binding. Override in subclasses for type checking."""
+        pass  # pragma: no cover
+
     @property
     def pool(self) -> ConnectionPoolBase:
         """Get the connection pool used by this binder."""
@@ -112,6 +116,7 @@ class BoundFunction(ABC):
     """Abstract class for common behaviors between bound functions."""
 
     def __init__(self, binder: FunctionBinderBase, func: callable):  # noqa: D107
+        binder._validate_function(func)
         self._binder = binder
         self._func = func
         self._sig = inspect.signature(func)

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/binding/binders/sync.py

@@ -14,7 +14,7 @@ from dinao.binding.binders.base import (
     BoundTransactionBase,
     FunctionBinderBase,
 )
-from dinao.binding.errors import NoPoolSetError, TooManyRowsError
+from dinao.binding.errors import IncompatibleBindingError, NoPoolSetError, TooManyRowsError
 from dinao.binding.mappers import GENERATOR_GENERICS
 
 
@@ -26,6 +26,19 @@ class FunctionBinder(FunctionBinderBase):
         super().__init__()
         self._context_store = threading.local()
 
+    def _validate_function(self, func):
+        """Validate that the function is not a coroutine.
+
+        :raises IncompatibleBindingError
+        """
+        if inspect.iscoroutinefunction(func):
+            error = (
+                f"FunctionBinder cannot bind async function"
+                f" '{func.__name__}'; use AsyncFunctionBinder"
+                f" for async functions"
+            )
+            self._suppressed_raise(IncompatibleBindingError(error))
+
     def execute(self, sql: str) -> callable:
         """Binds a given function to a given SQL template.
 

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/dinao/binding/errors.py

@@ -33,6 +33,12 @@ class TemplateError(BindingError):
     pass
 
 
+class IncompatibleBindingError(BindingError):
+    """Raised when a function's coroutine type is incompatible with its binder."""
+
+    pass
+
+
 class FunctionAlreadyBoundError(BindingError):
     """Raised when a function is bound more than once to a query, execution, or transaction."""
 

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178/dinao.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dinao
-Version: 2.2.0.dev174
+Version: 2.2.0.dev178
 Summary: A simple database API
 Author-email: Jim Carreer <jim.carreer+dinao@gmail.com>
 License-Expression: ISC

{dinao-2.2.0.dev174 → dinao-2.2.0.dev178}/pyproject.toml

@@ -87,3 +87,6 @@ branch = true
 exclude_lines = [
     "pragma: no cover",
 ]
+partial_branches = [
+    "pragma: no branch",
+]

dinao-2.2.0.dev174/dinao/__version__.py

@@ -1,2 +0,0 @@
-# noqa: D100
-__version__ = "2.2.0.dev174"