Add class Mybatis

Author: ralgond

.github/workflows/ci.yml

@@ -12,6 +12,17 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: mybatis
+          MYSQL_DATABASE: mybatis
+          MYSQL_USER: mybatis
+          MYSQL_PASSWORD: mybatis
+        ports:
+          - 3306:3306
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -23,7 +34,18 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install pytest pytest-cov
+          pip install pytest pytest-cov mysql-connector-python
+
+      - name: Set up MySQL client
+        run: sudo apt-get install mysql-client
+
+      - name: Wait for MySQL to be ready
+        run: |
+          until mysql -h 127.0.0.1 -u mybatis -pmybatis -e "SELECT 1"; do
+            echo "Waiting for MySQL..."
+            sleep 2
+          done
+          echo "MySQL is ready!"
 
       - name: Run tests with coverage
         run: |

example.py

@@ -12,6 +12,10 @@
 
 cur = conn.cursor(prepared=True)
 
+class A:
+    def __init__(self):
+        pass
+
 def main():
     mm = MapperManager()
 
@@ -45,5 +49,7 @@ def main():
     # res = cur.fetchall()
     # print(res)
 
+    print(globals()['A'])
+
 if __name__ == "__main__":
     main()

mapper/test.xml

@@ -28,7 +28,7 @@
         FROM
         fruits
         WHERE
-        category = 'apple' AND
+        category = 'A' AND
         <![CDATA[ price < 500 ]]>
     </select>
 

mapper/test2.xml

@@ -0,0 +1,15 @@
+<?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>
+    <select id="testBasicNone">
+        SELECT
+        id,
+        name,
+        category,
+        price
+        FROM
+        fruits
+        WHERE
+        category = 'C'
+    </select>
+</mapper>

mybatis/__init__.py

@@ -1 +1,2 @@
-from .mapper_manager import MapperManager
+from .mapper_manager import MapperManager
+from .mybatis import Mybatis

mybatis/mybatis.py

@@ -0,0 +1,30 @@
+from typing import Optional
+
+import mysql.connector
+import sqlite3
+
+from .mapper_manager import MapperManager
+import os
+
+class Mybatis(object):
+    def __init__(self, conn, mapper_path:str):
+        self.conn = conn
+        self.mapper_manager = MapperManager()
+
+        mapper_file_name_l = [name for name in os.listdir(mapper_path) if name.endswith(".xml")]
+        for file_name in mapper_file_name_l:
+            full_path = os.path.join(mapper_path, file_name)
+            self.mapper_manager.read_mapper_xml_file(full_path)
+
+    def select_one(self, id:str, param:dict) -> Optional[dict]:
+        sql, param_list = self.mapper_manager.select(id, param)
+        with self.conn.cursor(prepared=True) as cursor:
+            cursor.execute(sql, param_list)
+            ret = cursor.fetchone()
+            if ret is None:
+                return None
+            column_name = [item[0] for item in cursor.description]
+            res = {}
+            for idx, item in enumerate(column_name):
+                res[item] = ret[idx]
+            return res

setup.py

@@ -11,6 +11,7 @@
     url='https://github.com/ralgond/mybatis-py',
     packages=find_packages(),
     install_requires=[
+        'mysql-connector-python>=9.0.0'
     ],
     classifiers=[
         'Programming Language :: Python :: 3',

test/test_mapper_manager.py

@@ -1,6 +1,6 @@
-import pytest
 from mybatis import MapperManager
 
+
 def test_include():
     mm = MapperManager()
     mm.read_mapper_xml_file("mapper/test.xml")

test/test_mybatis.py

@@ -0,0 +1,49 @@
+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"
+    )
+    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_select_one(db_connection):
+    mb = Mybatis(db_connection, "mapper")
+    ret = mb.select_one('testBasic', {})
+    assert ret is not None
+    assert len(ret) == 4
+    assert ret['id'] == 1
+    assert ret['name'] == 'Alice'
+    assert ret['category'] == 'A'
+    assert ret['price'] == 100
+
+def test_select_one_none(db_connection):
+    mb = Mybatis(db_connection, "mapper")
+    ret = mb.select_one('testBasicNone', {})
+    assert ret is None