Feature/enhance

data/make_data.py

@@ -15,6 +15,8 @@
     for i in range(100):
         values = []
         for j in range(col):
-            values.append(f"({i*col+j},\"{''.join(random.choices(alphabet,k=10))}\")")
+            values.append(
+                f'({i * col + j},"{"".join(random.choices(alphabet, k=10))}")'
+            )
         conn.exec_driver_sql(f"insert into test.t1 value{','.join(values)}")
     conn.commit()

devtools/create_data.py

@@ -32,14 +32,15 @@ class User(Base):
     ids = iter(random.sample(range(0, 2 * 1000 * 1000), 1000 * 1000))
     for i in range(1000):
         session.bulk_insert_mappings(
-            User, [{"id": next(ids), "name": "a"*5000, "age": 10} for j in range(1000)]
+            User,
+            [{"id": next(ids), "name": "a" * 5000, "age": 10} for j in range(1000)],
         )
 elif len(sys.argv) > 1 and sys.argv[1] == "drop":
     User.__table__.drop(bind=engine)
 else:
     for i in range(1000):
         session.bulk_insert_mappings(
-            User, [{"name": "a"*5000, "age": 10} for i in range(1000)]
+            User, [{"name": "a" * 5000, "age": 10} for i in range(1000)]
         )
 
 session.commit()

devtools/deploy_mysqld.py

@@ -3,6 +3,7 @@
 import click
 import json
 from pprint import pprint
+from pathlib import Path
 
 from dataclasses import dataclass, asdict
 from testcontainers.mysql import MySqlContainer
@@ -18,6 +19,8 @@
 
 c.ryuk_disabled = True
 
+def get_project_root():
+    return Path(__file__).parent.parent
 
 @click.group()
 def main():
@@ -29,6 +32,8 @@ def tlist():
     data = load_deploy()
     pprint(data)
 
+DEPLOY_MYSQLD_PATH=get_project_root() / ".deploy_mysqld"
+DATADIR_BASE=get_project_root() / "datadir"
 
 @main.command()
 @click.option("--version", type=click.STRING)
@@ -47,7 +52,7 @@ def clean(version):
         shutil.rmtree(deploy.datadir)
 
     del data[version]
-    with open(".deploy_mysqld", "w") as f:
+    with open(DEPLOY_MYSQLD_PATH, "w") as f:
         dump_deploy(data, f)
 
 
@@ -60,8 +65,8 @@ class Instance:
 
 
 def load_deploy():
-    if os.path.exists(".deploy_mysqld"):
-        with open(".deploy_mysqld", "r") as f:
+    if os.path.exists(DEPLOY_MYSQLD_PATH):
+        with open(DEPLOY_MYSQLD_PATH, "r") as f:
             try:
                 data = json.load(f)
                 for k, v in data.items():
@@ -90,12 +95,12 @@ def mDeploy(version):
         return
 
     mContainer = MySqlContainer(f"mysql:{version}")
-    datadir = os.getcwd() + f"/datadir/{version}"
+    datadir = DATADIR_BASE / f"/datadir/{version}"
     mContainer.with_volume_mapping(datadir, "/var/lib/mysql", "rw")
     os.makedirs(datadir)
     mContainer.with_kwargs(remove=True, user=os.getuid(), userns_mode="host")
     mysql = mContainer.start()
-    with open(".deploy_mysqld", "w") as f:
+    with open(DEPLOY_MYSQLD_PATH, "w") as f:
         deploy_container[version] = Instance(
             url=mysql.get_connection_url().replace("localhost", "127.0.0.1"),
             container_id=f"{mysql._container.short_id}",
@@ -138,6 +143,10 @@ def exec(version, sql, file):
     url = deploy_container.get(version).url
     engine = create_engine(url)
     if file != "":
+        if not os.path.isabs(file):
+            poe_cwd = os.getenv("POE_CWD")
+            if poe_cwd:
+                file = os.path.join(poe_cwd, file)
         with open(file, "r") as f:
             sql = f.read()
     with engine.connect() as conn:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyinnodb"
-version = "0.0.28"
+version = "0.0.29"
 description = "A parser for InnoDB file formats, in Python"
 authors = [
     { name = "WinChua", email = "winchua@foxmail.com" }
@@ -57,6 +57,6 @@ of = ["of:init", "of:req", "of:cp", "of:clean",  "of:zip", "of:patch", "of:ex"]
 "of:zip" = "python -m zipapp target/ -m pyinnodb.cli:main -o pyinnodb.sh"
 "of:patch" = 'sed -i "1i\#!/usr/bin/env python3" pyinnodb.sh'
 "of:ex" = 'chmod a+x pyinnodb.sh'
-"dp" = "python devtools/deploy_mysqld.py"
+"dp" = "python ${POE_ROOT}/devtools/deploy_mysqld.py"
 "td" = "tar cvzf tests/test_data.tgz tests/mysql5/ tests/mysql8"
 bp.shell = "uv version --bump patch && git add -u . && git commit -m \"version release: `uv version --short`\" && git push"

src/pyinnodb/cli/__main__.py

@@ -1,4 +1,8 @@
 from .main import *
+import os
 
 if __name__ == "__main__":
+    poe_cwd = os.getenv("POE_CWD")
+    if poe_cwd:
+        os.chdir(poe_cwd)
     main()

tests/context.py

@@ -4,7 +4,8 @@
 import pathlib
 import pytest
 from collections import namedtuple
-#ruff: noqa
+
+# ruff: noqa
 from pyinnodb import const
 
 cur_file = pathlib.Path(__file__)

tests/test_parse.py

@@ -35,7 +35,7 @@ def test_parse_mysql8(mysqlfile: MysqlFile):
         REAL=1092.892,
         SMALLINT=981,
         TEXT="TEXT",
-        TIME=MTime2(bin_data=b'\x801\x00'),
+        TIME=MTime2(bin_data=b"\x801\x00"),
         TIMESTAMP=datetime.datetime.strptime("2024-07-24 09:05:28", timeformat).replace(
             tzinfo=datetime.timezone.utc
         ),