Add namespace logic.

Author: ralgond

mapper/test_namespace.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 namespace="test_namespace">
+    <insert id="testInsert">
+        INSERT INTO fruits (name, category, price) VALUES (#{name},#{category},#{price})
+    </insert>
+    <delete id="testDelete">
+        DELETE FROM fruits WHERE id=#{id}
+    </delete>
+    <update id="testUpdate">
+        UPDATE fruits SET name=#{name} WHERE id=#{id}
+    </update>
+</mapper>

mybatis/mapper_manager.py

@@ -9,17 +9,23 @@ def __init__(self):
         self.replace_pattern = re.compile(r"\${([a-zA-Z0-9_\-]+)}")
 
     def read_mapper_xml_file(self, mapper_xml_file_path):
+        namespace = ""
         root = et.parse(mapper_xml_file_path).getroot()
         for child in root.iter():
             if child.tag == 'mapper':
+                if "namespace" in child.attrib:
+                    namespace = child.attrib["namespace"]
                 root = child
                 break
 
         for child in root:
             child_id = child.attrib["id"]
             if child_id is None:
                 raise Exception("Missing id")
-            self.id_2_element_map[child_id] = child
+            if namespace == "":
+                self.id_2_element_map[child_id] = child
+            else:
+                self.id_2_element_map[namespace+"."+child_id] = child
 
 
     # @staticmethod

setup.py

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

test/test_namespace.py

@@ -0,0 +1,63 @@
+import pytest
+import mysql.connector
+
+from mybatis import Mybatis, MapperManager
+
+
+@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_namespace(db_connection):
+    mm = MapperManager()
+    mm.read_mapper_xml_file("mapper/test_namespace.xml")
+
+    sql, param_list = mm.insert("test_namespace.testInsert", {'name': 'Alice', 'category': 'A', 'price': 100})
+    assert sql == "INSERT INTO fruits (name, category, price) VALUES (?,?,?)"
+    assert len(param_list) == 3
+    assert param_list[0] == 'Alice'
+    assert param_list[1] == 'A'
+    assert param_list[2] == 100
+
+    sql, param_list = mm.delete("test_namespace.testDelete", {'id': 1})
+    assert sql == "DELETE FROM fruits WHERE id=?"
+    assert len(param_list) == 1
+    assert param_list[0] == 1
+
+    sql, param_list = mm.update("test_namespace.testUpdate", {'name': 'Bob', 'id':1})
+    assert sql == "UPDATE fruits SET name=? WHERE id=?"
+    assert len(param_list) == 2
+    assert param_list[0] == 'Bob'
+    assert param_list[1] == 1
+
+
+
+