Add Errors Logic.

Author: ralgond

README.md

@@ -179,17 +179,18 @@ Based on security considerations, in order to prevent SQL injection, it is recom
 mybatis-py maintains a cache pool for each connection. The elimination strategy is LRU. You can define the maximum byte capacity of the pool. If you do not want to use cache, you can set the parameter configuration. The code is as follows:
 ```python
 from mybatis import *
-import mysql.connector
 
 def main():
-    conn1 = mysql.connector.connect(
+    conn1 = ConnectionFactory.get_connection(
+        dbms_name="mysql",
         host="localhost",
         user="mybatis",
         password="mybatis",
         database="mybatis"
     )
 
-    conn2 = mysql.connector.connect(
+    conn2 = ConnectionFactory.get_connection(
+        dbms_name="mysql",
         host="localhost",
         user="mybatis",
         password="mybatis",
@@ -206,9 +207,10 @@ In order to prevent users from always getting old data, the cache will determine
 ### Auto Reconnecting
 ```python
 from flask import Flask
-import mysql.connector
-from mybatis import Mybatis
-import json
+
+import mybatis.errors
+from mybatis import Mybatis, ConnectionFactory
+import orjson as json
 import functools
 
 app = Flask(__name__)
@@ -228,14 +230,15 @@ def make_connection_and_mybatis():
 
     if conn is None:
         try:
-            conn = mysql.connector.connect(
+            conn = ConnectionFactory.get_connection(
+                            dbms_name="postgresql",
                             host="localhost",
                             user="mybatis",  
                             password="mybatis", 
-                            database="mybatis",
-                            autocommit=False
+                            database="mybatis"
             )
             mb.conn = conn
+            mb.conn.set_autocommit(False)
 
             return True
 
@@ -270,7 +273,7 @@ def select_many():
 def insert():
     pass
 
-def mysql_auto_reconnect(func):
+def sql_auto_reconnect(func):
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         global connection_error
@@ -282,7 +285,7 @@ def mysql_auto_reconnect(func):
             ret = func(*args, **kwargs)
             return ret, 200
 
-        except mysql.connector.errors.Error as e:
+        except mybatis.errors.DatabaseError as e:
             connection_error = True
             return str(e), 500
         except Exception as e:
@@ -292,15 +295,19 @@ def mysql_auto_reconnect(func):
 
 
 @app.route('/')
-@mysql_auto_reconnect
+@sql_auto_reconnect
 def hello():
     ret = select_many()
     return json.dumps(ret)
 
 
 @app.route('/insert')
-@mysql_auto_reconnect
+@sql_auto_reconnect
 def do_insert():
     ret = insert()
     return json.dumps(ret)
+
+if __name__ == "__main__":
+    app.run(debug=True)
+
 ```

example.py

@@ -1,25 +1,9 @@
 from mybatis import *
 
-import mysql.connector
-
-# 连接到 MySQL 数据库
-conn = mysql.connector.connect(
-    host="localhost",         # MySQL 主机地址
-    user="root",     # MySQL 用户名
-    password="19875522", # MySQL 密码
-    database="sakila"  # 需要连接的数据库
-)
-
-cur = conn.cursor(prepared=True)
-
-class A:
-    def __init__(self):
-        pass
-
 def main():
     mm = MapperManager()
 
-    mm.read_mapper_xml_file("mapper/test.xml")
+    mm.read_mapper_xml_file("mapper/test_returning_id.xml")
 
     # sql, param_list = mm.select("testInclude", {'category':"A", "price":500})
     # print(sql, param_list)
@@ -45,7 +29,10 @@ def main():
     # sql, param_list = mm.select("testStringReplace", {'id':1, 'date':"20241204"})
     # print(sql, param_list)
 
-    sql, param_list = mm.insert("testInsertSelective", {'name': 'Candy', 'category': "C", 'price':500})
+    # sql, param_list = mm.insert("testInsertSelective", {'name': 'Candy', 'category': "C", 'price':500})
+    # print(sql, param_list)
+
+    sql, param_list = mm.insert("test_returning_id.insert", {'name': 'Candy', 'category': "C", 'price':500, '__need_returning_id__':'fid'})
     print(sql, param_list)
 
     # cur.execute(sql, param_list, multi=True)

example_flask_mybatis.py

@@ -1,6 +1,7 @@
 from flask import Flask
-import mysql.connector
-from mybatis import Mybatis
+
+import mybatis.errors
+from mybatis import Mybatis, ConnectionFactory
 import orjson as json
 import functools
 
@@ -21,14 +22,15 @@ def make_connection_and_mybatis():
 
     if conn is None:
         try:
-            conn = mysql.connector.connect(
+            conn = ConnectionFactory.get_connection(
+                            dbms_name="postgresql",
                             host="localhost",
                             user="mybatis",  
                             password="mybatis", 
-                            database="mybatis",
-                            autocommit=True
+                            database="mybatis"
             )
             mb.conn = conn
+            mb.conn.set_autocommit(False)
 
             return True
 
@@ -63,7 +65,7 @@ def select_many():
 def insert():
     pass
 
-def mysql_auto_reconnect(func):
+def sql_auto_reconnect(func):
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         global connection_error
@@ -72,32 +74,27 @@ def wrapper(*args, **kwargs):
             if ret is False:
                 return error_string, 500
 
-
-
             ret = func(*args, **kwargs)
             return ret, 200
 
-        except mysql.connector.errors.Error as e:
+        except mybatis.errors.DatabaseError as e:
             connection_error = True
             return str(e), 500
         except Exception as e:
             return str(e), 500
 
-    #wrapper.__name__ = func.__name__
-    #wrapper.__doc__ = func.__doc__
-
     return wrapper
 
 
 @app.route('/')
-@mysql_auto_reconnect
+@sql_auto_reconnect
 def hello():
     ret = select_many()
     return json.dumps(ret)
 
 
 @app.route('/insert')
-@mysql_auto_reconnect
+@sql_auto_reconnect
 def do_insert():
     ret = insert()
     return json.dumps(ret)

mapper/test_returning_id.xml

@@ -0,0 +1,10 @@
+<?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 namespace="test_returning_id">
+    <insert id="insert">
+        INSERT INTO fruits (name, category, price) VALUES (#{name}, #{category}, #{price})
+        <if test="'__need_returning_id__' in params">
+                RETURNING ${__need_returning_id__}
+        </if>
+    </insert>
+</mapper>