sqlspec 0.12.0__py3-none-any.whl → 0.12.1__py3-none-any.whl

sqlspec/adapters/psycopg/config.py

@@ -606,57 +606,50 @@ class PsycopgAsyncConfig(AsyncDatabaseConfig[PsycopgAsyncConnection, AsyncConnec
 
     async def _create_pool(self) -> "AsyncConnectionPool":
         """Create the actual async connection pool."""
-        logger.info("Creating async Psycopg connection pool", extra={"adapter": "psycopg"})
 
-        try:
-            # Get all config (creates a new dict)
-            all_config = self.pool_config_dict.copy()
+        # Get all config (creates a new dict)
+        all_config = self.pool_config_dict.copy()
+
+        # Separate pool-specific parameters that AsyncConnectionPool accepts directly
+        pool_params = {
+            "min_size": all_config.pop("min_size", 4),
+            "max_size": all_config.pop("max_size", None),
+            "name": all_config.pop("name", None),
+            "timeout": all_config.pop("timeout", 30.0),
+            "max_waiting": all_config.pop("max_waiting", 0),
+            "max_lifetime": all_config.pop("max_lifetime", 3600.0),
+            "max_idle": all_config.pop("max_idle", 600.0),
+            "reconnect_timeout": all_config.pop("reconnect_timeout", 300.0),
+            "num_workers": all_config.pop("num_workers", 3),
+        }
 
-            # Separate pool-specific parameters that AsyncConnectionPool accepts directly
-            pool_params = {
-                "min_size": all_config.pop("min_size", 4),
-                "max_size": all_config.pop("max_size", None),
-                "name": all_config.pop("name", None),
-                "timeout": all_config.pop("timeout", 30.0),
-                "max_waiting": all_config.pop("max_waiting", 0),
-                "max_lifetime": all_config.pop("max_lifetime", 3600.0),
-                "max_idle": all_config.pop("max_idle", 600.0),
-                "reconnect_timeout": all_config.pop("reconnect_timeout", 300.0),
-                "num_workers": all_config.pop("num_workers", 3),
-            }
+        # Create a configure callback to set row_factory
+        async def configure_connection(conn: "PsycopgAsyncConnection") -> None:
+            # Set DictRow as the row factory
+            conn.row_factory = dict_row
 
-            # Create a configure callback to set row_factory
-            async def configure_connection(conn: "PsycopgAsyncConnection") -> None:
-                # Set DictRow as the row factory
-                conn.row_factory = dict_row
+        pool_params["configure"] = all_config.pop("configure", configure_connection)
 
-            pool_params["configure"] = all_config.pop("configure", configure_connection)
+        # Remove None values from pool_params
+        pool_params = {k: v for k, v in pool_params.items() if v is not None}
 
-            # Remove None values from pool_params
-            pool_params = {k: v for k, v in pool_params.items() if v is not None}
+        # Handle conninfo vs individual connection parameters
+        conninfo = all_config.pop("conninfo", None)
+        if conninfo:
+            # If conninfo is provided, use it directly
+            # Don't pass kwargs when using conninfo string
+            pool = AsyncConnectionPool(conninfo, open=False, **pool_params)
+        else:
+            # Otherwise, pass connection parameters via kwargs
+            # Remove any non-connection parameters
+            # row_factory is already popped out earlier
+            all_config.pop("row_factory", None)
+            # Remove pool-specific settings that may have been left
+            all_config.pop("kwargs", None)
+            pool = AsyncConnectionPool("", kwargs=all_config, open=False, **pool_params)
 
-            # Handle conninfo vs individual connection parameters
-            conninfo = all_config.pop("conninfo", None)
-            if conninfo:
-                # If conninfo is provided, use it directly
-                # Don't pass kwargs when using conninfo string
-                pool = AsyncConnectionPool(conninfo, **pool_params)
-            else:
-                # Otherwise, pass connection parameters via kwargs
-                # Remove any non-connection parameters
-                # row_factory is already popped out earlier
-                all_config.pop("row_factory", None)
-                # Remove pool-specific settings that may have been left
-                all_config.pop("kwargs", None)
-                pool = AsyncConnectionPool("", kwargs=all_config, **pool_params)
+        await pool.open()
 
-            await pool.open()
-            logger.info("Async Psycopg connection pool created successfully", extra={"adapter": "psycopg"})
-        except Exception as e:
-            logger.exception(
-                "Failed to create async Psycopg connection pool", extra={"adapter": "psycopg", "error": str(e)}
-            )
-            raise
         return pool
 
     async def _close_pool(self) -> None:
@@ -664,16 +657,7 @@ class PsycopgAsyncConfig(AsyncDatabaseConfig[PsycopgAsyncConnection, AsyncConnec
         if not self.pool_instance:
             return
 
-        logger.info("Closing async Psycopg connection pool", extra={"adapter": "psycopg"})
-
-        try:
-            await self.pool_instance.close()
-            logger.info("Async Psycopg connection pool closed successfully", extra={"adapter": "psycopg"})
-        except Exception as e:
-            logger.exception(
-                "Failed to close async Psycopg connection pool", extra={"adapter": "psycopg", "error": str(e)}
-            )
-            raise
+        await self.pool_instance.close()
 
     async def create_connection(self) -> "PsycopgAsyncConnection":  # pyright: ignore
         """Create a single async connection (not from pool).

{sqlspec-0.12.0.dist-info → sqlspec-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlspec
-Version: 0.12.0
+Version: 0.12.1
 Summary: SQL Experiments in Python
 Project-URL: Discord, https://discord.gg/litestar
 Project-URL: Issue, https://github.com/litestar-org/sqlspec/issues/

{sqlspec-0.12.0.dist-info → sqlspec-0.12.1.dist-info}/RECORD

@@ -35,7 +35,7 @@ sqlspec/adapters/psqlpy/__init__.py,sha256=dp0-96V4SAbNEvOqlJ8PWEyJMYzZGElVoyneZ
 sqlspec/adapters/psqlpy/config.py,sha256=NKlHHDjKr5dF4LQprYA5ivJsNy2UXkvYg8B-kXOvvjE,16342
 sqlspec/adapters/psqlpy/driver.py,sha256=xI89mFdkQulcntbH4ALTOOHn5b6_skCgSbjYDUfvyG4,8650
 sqlspec/adapters/psycopg/__init__.py,sha256=ukkCUPrJPyAG78v4rOqcK4WZDs26PeB9Ra9qkFrGJ3E,484
-sqlspec/adapters/psycopg/config.py,sha256=pNgh0FAB_5dpRHBY9zKEs9uofDtUod2IV4pjCY_jWK8,27723
+sqlspec/adapters/psycopg/config.py,sha256=SC6SfkgaiYIqHRPueZ3-Avq0AEotLD1d2TX-MJw1lzs,26766
 sqlspec/adapters/psycopg/driver.py,sha256=oTdhj5OXx1gtnA0ZIS0Fdvqu8erXhItn1fl0-lRxatI,33474
 sqlspec/adapters/sqlite/__init__.py,sha256=1lYrJ-DojUAOvXMoZRUJNEVyMmYhO41hMJnDWCEeXlw,234
 sqlspec/adapters/sqlite/config.py,sha256=7yHe1eeVGFZvmTdxUPF2XcIiEcgZFUdncuGf_6qG8Xc,6153
@@ -138,8 +138,8 @@ sqlspec/utils/serializers.py,sha256=TKsRryRcYMnb8Z8MGkYGClIxcYvC8CW7MsrPQTJqEcY,
 sqlspec/utils/singleton.py,sha256=KZ7481tlDAxq6gcAlpULVqPLNc9P0XkHOEp7hfWIHcI,1096
 sqlspec/utils/sync_tools.py,sha256=9ZL_7wJks896ZsRGVB4mS8DgIwK3tKmZClvLblEx8q4,8954
 sqlspec/utils/text.py,sha256=Bit0I0nBgETvfumzguOQFiqrqwplqaoTeEfGdLzgPOk,5083
-sqlspec-0.12.0.dist-info/METADATA,sha256=fUqPZZSl8key5koLqohfDZ2IUlyJ1Z1qbokEcLYdSS8,16663
-sqlspec-0.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlspec-0.12.0.dist-info/licenses/LICENSE,sha256=MdujfZ6l5HuLz4mElxlu049itenOR3gnhN1_Nd3nVcM,1078
-sqlspec-0.12.0.dist-info/licenses/NOTICE,sha256=Lyir8ozXWov7CyYS4huVaOCNrtgL17P-bNV-5daLntQ,1634
-sqlspec-0.12.0.dist-info/RECORD,,
+sqlspec-0.12.1.dist-info/METADATA,sha256=1THQMFzTiowWooK37RMk7UnuMdzuj8g9QzQKhsnE7NU,16663
+sqlspec-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlspec-0.12.1.dist-info/licenses/LICENSE,sha256=MdujfZ6l5HuLz4mElxlu049itenOR3gnhN1_Nd3nVcM,1078
+sqlspec-0.12.1.dist-info/licenses/NOTICE,sha256=Lyir8ozXWov7CyYS4huVaOCNrtgL17P-bNV-5daLntQ,1634
+sqlspec-0.12.1.dist-info/RECORD,,