fix cursor commit

Author: long2ice

asyncodbc/connection.py

@@ -122,7 +122,7 @@ def __init__(
     def _execute(self, func, *args, **kwargs):
         # execute function with args and kwargs in thread pool
         func = partial(func, *args, **kwargs)
-        future = asyncio.get_running_loop().run_in_executor(self._executor, func)
+        future = asyncio.get_event_loop().run_in_executor(self._executor, func)
         return future
 
     async def _connect(self):

asyncodbc/cursor.py

@@ -337,4 +337,3 @@ async def __aenter__(self):
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await self.close()
-        return

asyncodbc/utils.py

@@ -78,10 +78,6 @@ async def __aenter__(self):
         return self._obj
 
     async def __aexit__(self, exc_type, exc, tb):
-        if exc_type:
-            await self._obj.rollback()
-        elif not self._obj.autocommit:
-            await self._obj.commit()
         await self._obj.close()
         self._obj = None
 
@@ -116,8 +112,5 @@ async def __aexit__(self, exc_type, exc, tb):
 
 class _ConnectionContextManager(_ContextManager):
     async def __aexit__(self, exc_type, exc, tb):
-        if exc_type is not None:
-            self._obj.close()
-        else:
-            await self._obj.close()
+        await self._obj.close()
         self._obj = None

conftest.py

@@ -25,16 +25,15 @@ def event_loop():
 @pytest_asyncio.fixture(scope="session", autouse=True)
 async def database():
     connection = await asyncodbc.connect(dsn=os.getenv("TEST_DSN"), autocommit=True)
-    cur = await connection.cursor()
     db = f"test_{uuid.uuid4()}".replace("-", "")
-    await cur.execute(f"CREATE DATABASE {db};")
+    await connection.execute(f"CREATE DATABASE {db};")
     yield db
-    await cur.execute(f"DROP DATABASE {db};")
+    await connection.execute(f"DROP DATABASE {db};")
     await connection.close()
 
 
 @pytest.fixture
-async def connection_maker(dsn):
+async def connection_maker(dsn, database):
     cleanup = []
 
     async def make(**kw):
@@ -44,7 +43,7 @@ async def make(**kw):
         else:
             executor = kw["executor"]
 
-        conn = await asyncodbc.connect(dsn=dsn, **kw)
+        conn = await asyncodbc.connect(dsn=dsn, database=database, **kw)
         cleanup.append((conn, executor))
         return conn
 

tests/test_pool.py

@@ -352,7 +352,7 @@ async def wait_closed():
         do_release(c1),
         do_release(c2),
     )
-    assert ["release", "release", "wait_closed"] == ops
+    assert sorted(["release", "release", "wait_closed"]) == sorted(ops)
     assert 0 == pool.freesize
 
 
@@ -466,28 +466,29 @@ async def aexit_conntex_managet(conn):
         # commit on exit if no error
         params = (1, "123.45")
         async with conn.cursor() as cur:
-            await cur.execute("CREATE TABLE cmt1(n int, v VARCHAR(10))")
-            await cur.execute("INSERT INTO cmt1 VALUES (?,?);", params)
+            await cur.execute("CREATE TABLE cmt(n int, v VARCHAR(10))")
+            await cur.execute("INSERT INTO cmt VALUES (?,?)", params)
         async with conn.cursor() as cur:
-            await cur.execute("SELECT v FROM cmt1 WHERE n=1;")
+            await cur.execute("SELECT v FROM cmt WHERE n=1;")
             (value,) = await cur.fetchone()
             assert value == params[1]
 
         # rollback on exit if error
         with pytest.raises(Error):
             async with conn.cursor() as cur:
-                await cur.execute("ins INTO cmt1 VALUES (2, '666');")
+                await cur.execute("ins INTO cmt VALUES (2, '666');")
         async with conn.cursor() as cur:
-            await cur.execute("SELECT v FROM cmt1 WHERE n=2;")
+            await cur.execute("SELECT v FROM cmt WHERE n=2")
             row = await cur.fetchone()
             assert row is None
 
         async with conn.cursor() as cur:
-            await cur.execute("DROP TABLE cmt1;")
+            await cur.execute("DROP TABLE cmt")
 
     conn = await connection_maker(autocommit=False)
     assert not conn.autocommit
     await aexit_conntex_managet(conn)
+    await conn.commit()
 
     conn = await connection_maker(autocommit=True)
     assert conn.autocommit