diff --git a/pyproject.toml b/pyproject.toml index abd4e0b..ace1022 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "noverde-serpens" -version = "2.8.0" +version = "2.8.1" description = "A set of Python utilities, recipes and snippets" readme = {file = "README.md", content-type = "text/markdown"} authors = [ diff --git a/serpens/database/__init__.py b/serpens/database/__init__.py index 45a2d3a..0f4f70b 100644 --- a/serpens/database/__init__.py +++ b/serpens/database/__init__.py @@ -52,11 +52,9 @@ def _on_connect(dbapi_conn, _): idle_ms = int(os.getenv("DB_IDLE_IN_TX_TIMEOUT_MS", "10000")) cur = dbapi_conn.cursor() try: - cur.execute( - f"SET statement_timeout = {stmt_ms};" - f"SET lock_timeout = {lock_ms};" - f"SET idle_in_transaction_session_timeout = {idle_ms}" - ) + cur.execute(f"SET statement_timeout = {stmt_ms}") + cur.execute(f"SET lock_timeout = {lock_ms}") + cur.execute(f"SET idle_in_transaction_session_timeout = {idle_ms}") finally: cur.close() diff --git a/tests/test_database.py b/tests/test_database.py index b3e9734..24e740c 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -177,10 +177,11 @@ def test_executes_set_statements(self): }, ): database._on_connect(conn, None) - called_sql = cur.execute.call_args.args[0] - self.assertIn("statement_timeout = 9000", called_sql) - self.assertIn("lock_timeout = 1500", called_sql) - self.assertIn("idle_in_transaction_session_timeout = 12000", called_sql) + executed = [c.args[0] for c in cur.execute.call_args_list] + self.assertEqual(len(executed), 3) + self.assertEqual(executed[0], "SET statement_timeout = 9000") + self.assertEqual(executed[1], "SET lock_timeout = 1500") + self.assertEqual(executed[2], "SET idle_in_transaction_session_timeout = 12000") cur.close.assert_called_once()