Release v0.0.12. Add rollback logic.

Author: ralgond

example_decorator.py

@@ -6,6 +6,7 @@
     user="mybatis",  # MySQL 用户名
     password="mybatis",  # MySQL 密码
     database="mybatis",  # 需要连接的数据库,
+    autocommit=False
 )
 
 mb = Mybatis(conn, "mapper", cache_memory_limit=50*1024*1024)

mapper/test_db_rollback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper>
+    <insert id="testDBRollbackInsert">
+        INSERT INTO fruits2 (name, category, price) VALUES ('Candy', 'B', 500)
+    </insert>
+    <delete id="testDBRollbackDelete">
+        DELETE FROM fruits2 WHERE id=1
+    </delete>
+    <update id="testDBRollbackUpdate">
+        UPDATE fruits2 SET name='Candy' WHERE id=1
+    </update>
+</mapper>

mybatis/mybatis.py

@@ -1,5 +1,7 @@
 from typing import Optional, Dict, List
 
+import mysql.connector.errors
+
 from .mapper_manager import MapperManager
 from .cache import Cache, CacheKey
 
@@ -98,10 +100,14 @@ def update(self, id:str, params:dict) -> int:
         res = self.cache.clear()
 
         with self.conn.cursor(prepared=True) as cursor:
-            cursor.execute(sql, param_list)
-            affected_rows = cursor.rowcount
-            self.conn.commit()
-            return affected_rows
+            try:
+                cursor.execute(sql, param_list)
+                affected_rows = cursor.rowcount
+                self.conn.commit()
+                return affected_rows
+            except mysql.connector.errors.Error as e:
+                self.conn.rollback()
+                raise e
 
     def delete(self, id:str, params:dict) -> int:
         '''
@@ -114,10 +120,14 @@ def delete(self, id:str, params:dict) -> int:
         res = self.cache.clear()
 
         with self.conn.cursor(prepared=True) as cursor:
-            cursor.execute(sql, param_list)
-            affected_rows = cursor.rowcount
-            self.conn.commit()
-            return affected_rows
+            try:
+                cursor.execute(sql, param_list)
+                affected_rows = cursor.rowcount
+                self.conn.commit()
+                return affected_rows
+            except mysql.connector.errors.Error as e:
+                self.conn.rollback()
+                raise e
 
     def insert(self, id:str, params:dict) -> int:
         '''
@@ -130,10 +140,14 @@ def insert(self, id:str, params:dict) -> int:
         res = self.cache.clear()
 
         with self.conn.cursor(prepared=True) as cursor:
-            cursor.execute(sql, param_list)
-            self.conn.commit()
-            last_id = cursor.lastrowid
-            return last_id
+            try:
+                cursor.execute(sql, param_list)
+                self.conn.commit()
+                last_id = cursor.lastrowid
+                return last_id
+            except mysql.connector.errors.Error as e:
+                self.conn.rollback()
+                raise e
 
 
     def SelectOne(self, unparsed_sql:str) -> Optional[Dict]:
@@ -220,10 +234,14 @@ def wrapper(*args, **kwargs):
                 res = self.cache.clear()
 
                 with self.conn.cursor(prepared=True) as cursor:
-                    cursor.execute(sql, param_list)
-                    self.conn.commit()
-                    last_id = cursor.lastrowid
-                    return last_id
+                    try:
+                        cursor.execute(sql, param_list)
+                        self.conn.commit()
+                        last_id = cursor.lastrowid
+                        return last_id
+                    except mysql.connector.errors.Error as e:
+                        self.conn.rollback()
+                        raise e
             return wrapper
         return decorator
 
@@ -240,10 +258,15 @@ def wrapper(*args, **kwargs):
                 res = self.cache.clear()
 
                 with self.conn.cursor(prepared=True) as cursor:
-                    cursor.execute(sql, param_list)
-                    affected_rows = cursor.rowcount
-                    self.conn.commit()
-                    return affected_rows
+                    try:
+                        cursor.execute(sql, param_list)
+                        affected_rows = cursor.rowcount
+                        self.conn.commit()
+                        return affected_rows
+                    except mysql.connector.errors.Error as e:
+                        self.conn.rollback()
+                        raise e
+
             return wrapper
         return decorator
 
@@ -260,10 +283,14 @@ def wrapper(*args, **kwargs):
                 res = self.cache.clear()
 
                 with self.conn.cursor(prepared=True) as cursor:
-                    cursor.execute(sql, param_list)
-                    affected_rows = cursor.rowcount
-                    self.conn.commit()
-                    return affected_rows
+                    try:
+                        cursor.execute(sql, param_list)
+                        affected_rows = cursor.rowcount
+                        self.conn.commit()
+                        return affected_rows
+                    except mysql.connector.errors.Error as e:
+                        self.conn.rollback()
+                        raise e
 
             return wrapper
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='mybatis',
-    version='0.0.11',
+    version='0.0.12',
     description='A python ORM like mybatis.',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',  # 如果你使用的是Markdown格式的README

test/test_db_rollback.py

@@ -0,0 +1,82 @@
+import pytest
+import mysql.connector
+
+from mybatis import Mybatis
+
+
+@pytest.fixture(scope="function")
+def db_connection():
+    # 配置数据库连接
+    connection = mysql.connector.connect(
+        host="localhost",
+        user="mybatis",
+        password="mybatis",
+        database="mybatis",
+        autocommit=False,
+    )
+    connection.start_transaction()
+    cursor = connection.cursor()
+    cursor.execute("DROP TABLE IF EXISTS fruits")
+    create_table_sql = '''CREATE TABLE IF NOT EXISTS fruits (
+        id INT AUTO_INCREMENT PRIMARY KEY, 
+        name VARCHAR(100),
+        category VARCHAR(100),
+        price int)
+    '''
+    # 在测试开始前准备数据
+    cursor.execute(create_table_sql)
+    cursor.execute("INSERT INTO fruits (name, category, price) VALUES ('Alice', 'A', 100)")
+    cursor.execute("INSERT INTO fruits (name, category, price) VALUES ('Bob', 'B', 200)")
+    connection.commit()
+
+    # 提供数据库连接给测试用例
+    yield connection
+
+    # 清理数据和关闭连接
+    connection.close()
+
+def test_db_rollback_error_table(db_connection):
+    mb = Mybatis(db_connection, "mapper")
+    @mb.Insert("INSERT INTO fruits2 (name, category, price) VALUES ('Candy', 'B', 500)")
+    def insert():
+        pass
+
+    try:
+        insert()
+    except mysql.connector.errors.Error as err:
+        assert True
+
+    @mb.Delete("DELETE FROM fruits2 WHERE id=1")
+    def delete():
+        pass
+
+    try:
+        delete()
+    except mysql.connector.errors.Error as err:
+        assert True
+
+    @mb.Delete("UPDATE fruits2 SET name='Candy' WHERE id=1")
+    def update():
+        pass
+
+    try:
+        update()
+    except mysql.connector.errors.Error as err:
+        assert True
+
+def test_db_rollback_error_table2(db_connection):
+    mb = Mybatis(db_connection, "mapper")
+    try:
+        mb.insert("testDBRollbackInsert", {})
+    except mysql.connector.errors.Error as err:
+        assert True
+
+    try:
+        mb.delete("testDBRollbackDelete", {})
+    except mysql.connector.errors.Error as err:
+        assert True
+
+    try:
+        mb.update("testDBRollbackUpdate", {})
+    except mysql.connector.errors.Error as err:
+        assert True

test/test_mybatis.py

@@ -11,8 +11,10 @@ def db_connection():
         host="localhost",
         user="mybatis",
         password="mybatis",
-        database="mybatis"
+        database="mybatis",
+        autocommit=False,
     )
+    connection.start_transaction()
     cursor = connection.cursor()
     cursor.execute("DROP TABLE IF EXISTS fruits")
     create_table_sql = '''CREATE TABLE IF NOT EXISTS fruits (

test/test_mybatis_decorator.py

@@ -11,8 +11,10 @@ def db_connection():
         host="localhost",
         user="mybatis",
         password="mybatis",
-        database="mybatis"
+        database="mybatis",
+        autocommit=False,
     )
+    connection.start_transaction()
     cursor = connection.cursor()
     cursor.execute("DROP TABLE IF EXISTS fruits")
     create_table_sql = '''CREATE TABLE IF NOT EXISTS fruits (
@@ -26,6 +28,7 @@ def db_connection():
     cursor.execute("INSERT INTO fruits (name, category, price) VALUES ('Alice', 'A', 100)")
     cursor.execute("INSERT INTO fruits (name, category, price) VALUES ('Bob', 'B', 200)")
     connection.commit()
+    cursor.close()
 
     # 提供数据库连接给测试用例
     yield connection