sqloader 0.2.7__tar.gz → 0.2.9__tar.gz

{sqloader-0.2.7/sqloader.egg-info → sqloader-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqloader
-Version: 0.2.7
+Version: 0.2.9
 Summary: A simple and extensible SQL migration and loader utility for Python.
 Home-page: https://github.com/horrible-gh/py_sqloader.git
 Author: horrible-gh
@@ -16,6 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: LogAssist
 Requires-Dist: pymysql>=1.1.1
+Requires-Dist: sqlparse>=0.4.0
 Provides-Extra: postgresql
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "postgresql"
 Provides-Extra: async-mysql

{sqloader-0.2.7 → sqloader-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sqloader"
-version = "0.2.7"
+version = "0.2.9"
 authors = [
   { name="horrible", email="shinjpn1@gmail.com" },
 ]
@@ -21,7 +21,7 @@ keywords = [
     "MySQL", "SQLite", "SQL migration", "schema management",
     "json sql loader"
 ]
-dependencies=['LogAssist', 'pymysql>=1.1.1']
+dependencies=['LogAssist', 'pymysql>=1.1.1', 'sqlparse>=0.4.0']
 
 [project.optional-dependencies]
 postgresql = ["psycopg2-binary>=2.9.0"]

{sqloader-0.2.7 → sqloader-0.2.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='sqloader',
-    version='0.2.7',
+    version='0.2.9',
     description='py_sqloader package',
     author='horrible-gh',
     author_email='shinjpn1@gmail.com',
@@ -23,6 +23,7 @@ setup(
     python_requires='>=3.6',
     install_requires=[
         "pymysql>=1.1.1",  # MySQL sync is always included
+        "sqlparse>=0.4.0",
     ],
     extras_require={
         "postgresql": ["psycopg2-binary>=2.9.0"],

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/migrator.py

@@ -1,5 +1,7 @@
 import os
+import re
 import glob
+import sqlparse
 from ._prototype import DatabasePrototype, MYSQL, SQLITE, POSTGRESQL
 
 class DatabaseMigrator:
@@ -53,15 +55,15 @@ class DatabaseMigrator:
         full_path = os.path.join(self.migrations_path, migration)
 
         with open(full_path, 'r', encoding='utf-8') as f:
-            sql_commands = f.read().split(';')
+            sql_commands = [s.strip() for s in sqlparse.split(f.read()) if s.strip()]
 
         try:
             # Execute all statements in a single transaction
             with self.db.begin_transaction() as txn:
                 for command in sql_commands:
-                    command = command.strip()
-                    if command:
-                        txn.execute(command)
+                    if not re.sub(r'--[^\n]*', '', command).strip():
+                        continue
+                    txn.execute(command)
                 # Auto-commit on exit, auto-rollback on exception
 
             if self.db.db_type == SQLITE:
@@ -97,4 +99,4 @@ class DatabaseMigrator:
         Filenames match the relative paths inserted by apply_migration().
         """
         rows = self.db.fetch_all("SELECT filename FROM migrations")
-        return {row['filename'] for row in rows}
+        return {row['filename'] for row in rows}

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/mysql_async.py

@@ -89,6 +89,9 @@ class AsyncMySqlWrapper(AsyncDatabasePrototype):
             print(f"Last query: {query}")
             raise
 
+    async def execute_query(self, query, params=None, commit=True):
+        return await self.execute(query, params, commit)
+
     async def fetchone(self, query, params=None):
         return await self.fetch_one(query, params)
 

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/postgresql.py

@@ -68,6 +68,9 @@ class PostgreSQLWrapper(DatabasePrototype):
                 self.pool.putconn(conn)
             query_semaphore.release()
 
+    def execute_query(self, query, params=None, commit=True):
+        return self.execute(query, params, commit)
+
     def fetchone(self, query, params=None):
         return self.fetch_one(query, params)
 

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/postgresql_async.py

@@ -119,6 +119,9 @@ class AsyncPostgreSQLWrapper(AsyncDatabasePrototype):
             print(f"Last query: {q}")
             raise
 
+    async def execute_query(self, query, params=None, commit=True):
+        return await self.execute(query, params, commit)
+
     async def fetchone(self, query, params=None):
         return await self.fetch_one(query, params)
 

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/sqlite3.py

@@ -86,6 +86,9 @@ class SQLiteWrapper(DatabasePrototype):
         else:
             return self._execute_file(query, params, commit)
 
+    def execute_query(self, query, params=None, commit=True):
+        return self.execute(query, params, commit)
+
     def fetchone(self, query, params=None):
         return self.fetch_one(query, params)
 

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader/sqlite3_async.py

@@ -94,6 +94,9 @@ class AsyncSQLiteWrapper(AsyncDatabasePrototype):
                 await self._conn.rollback()
                 raise
 
+    async def execute_query(self, query, params=None, commit=True):
+        return await self.execute(query, params, commit)
+
     async def fetchone(self, query, params=None):
         return await self.fetch_one(query, params)
 

{sqloader-0.2.7 → sqloader-0.2.9/sqloader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqloader
-Version: 0.2.7
+Version: 0.2.9
 Summary: A simple and extensible SQL migration and loader utility for Python.
 Home-page: https://github.com/horrible-gh/py_sqloader.git
 Author: horrible-gh
@@ -16,6 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: LogAssist
 Requires-Dist: pymysql>=1.1.1
+Requires-Dist: sqlparse>=0.4.0
 Provides-Extra: postgresql
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "postgresql"
 Provides-Extra: async-mysql

{sqloader-0.2.7 → sqloader-0.2.9}/sqloader.egg-info/requires.txt

@@ -1,5 +1,6 @@
 LogAssist
 pymysql>=1.1.1
+sqlparse>=0.4.0
 
 [all]
 psycopg2-binary>=2.9.0

{sqloader-0.2.7 → sqloader-0.2.9}/tests/test_migrator.py

@@ -128,4 +128,50 @@ class TestAutoRun:
     def test_auto_run_false_does_not_apply(self, db, migration_dir):
         m = DatabaseMigrator(db, migration_dir, auto_run=False)
         applied = m.get_applied_migrations()
-        assert len(applied) == 0
+        assert len(applied) == 0
+
+
+# ---------------------------------------------------------------------------
+# comment-only chunk (문제 1)
+# ---------------------------------------------------------------------------
+
+class TestCommentOnlyChunk:
+    def test_comment_only_file_does_not_raise(self, db):
+        """주석과 공백만 있는 청크는 실행 없이 건너뛰어야 한다."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with open(os.path.join(tmpdir, "001_comments.sql"), "w") as f:
+                f.write(
+                    "-- this is a comment\n"
+                    "CREATE TABLE comment_test (id INTEGER PRIMARY KEY);\n"
+                    "-- trailing comment\n"
+                )
+            m = DatabaseMigrator(db, tmpdir, auto_run=True)
+            applied = m.get_applied_migrations()
+            assert "001_comments.sql" in applied
+
+        rows = db.fetch_all(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name='comment_test'"
+        )
+        assert len(list(rows)) == 1
+
+
+# ---------------------------------------------------------------------------
+# multi-statement SQL file (문제 2 — split 경계 검증)
+# ---------------------------------------------------------------------------
+
+class TestMultiStatementFile:
+    def test_multiple_statements_in_one_file(self, db):
+        """세미콜론으로 구분된 여러 구문이 모두 올바르게 실행되어야 한다."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with open(os.path.join(tmpdir, "001_multi.sql"), "w") as f:
+                f.write(
+                    "CREATE TABLE multi_a (id INTEGER PRIMARY KEY);\n"
+                    "CREATE TABLE multi_b (id INTEGER PRIMARY KEY);\n"
+                )
+            DatabaseMigrator(db, tmpdir, auto_run=True)
+
+        for table in ("multi_a", "multi_b"):
+            rows = db.fetch_all(
+                f"SELECT name FROM sqlite_master WHERE type='table' AND name='{table}'"
+            )
+            assert len(list(rows)) == 1, f"Table {table} was not created"