sqlqb 0.1.3__tar.gz → 0.1.4__tar.gz

sqlqb-0.1.4/.envrc

@@ -0,0 +1,3 @@
+layout_ide
+
+export PYTHONSTARTUP=.pythonrc.py

sqlqb-0.1.4/.pythonrc.py

@@ -0,0 +1 @@
+from sqlqb import *  # noqa: F403

{sqlqb-0.1.3 → sqlqb-0.1.4}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: sqlqb
-Version: 0.1.3
+Version: 0.1.4
 Summary: A simple sql query builder
 Requires-Python: >=3.12

{sqlqb-0.1.3 → sqlqb-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlqb"
-version = "0.1.3"
+version = "0.1.4"
 description = "A simple sql query builder"
 readme = "README.md"
 authors = []

{sqlqb-0.1.3 → sqlqb-0.1.4}/src/sqlqb/delete.py

@@ -6,6 +6,7 @@ class Delete:
         self.__table: str | None = None
         self.__wheres: list[str] = []
         self.__params: list = []
+        self.__named_params: dict = {}
         self.__limit: int | None = None
 
     def From(self, table: str) -> "Delete":
@@ -14,9 +15,18 @@ class Delete:
         self.__table = table
         return self
 
-    def Where(self, condition: str, *args) -> "Delete":
+    def Where(self, condition: str, *args, **kwargs) -> "Delete":
+        if args and kwargs:
+            raise ValueError("error: cannot mix positional and named params")
+        if args and self.__named_params:
+            raise ValueError("error: cannot mix positional and named params")
+        if kwargs and self.__params:
+            raise ValueError("error: cannot mix positional and named params")
         self.__wheres.append(condition)
-        self.__params += args
+        if kwargs:
+            self.__named_params.update(kwargs)
+        else:
+            self.__params += list(args)
         return self
 
     def Limit(self, limit: int) -> "Delete":
@@ -24,7 +34,9 @@ class Delete:
         return self
 
     @property
-    def params(self) -> list:
+    def params(self) -> list | dict:
+        if self.__named_params:
+            return self.__named_params
         return self.__params
 
     @property

{sqlqb-0.1.3 → sqlqb-0.1.4}/src/sqlqb/pymysql/__init__.py

@@ -1,3 +1,5 @@
+import re
+
 from pymysql.connections import Connection as _Connection
 from pymysql.cursors import DictCursor
 
@@ -7,25 +9,35 @@ from sqlqb import Update as _Update
 from sqlqb import Delete as _Delete
 
 
+def _to_pymysql(sql: str, params: list | dict) -> tuple[str, list | dict]:
+    """Convert :name placeholders to %(name)s style for PyMySQL when params is a dict."""
+    if isinstance(params, dict):
+        sql = re.sub(r":([a-zA-Z_][a-zA-Z0-9_]*)", r"%(\1)s", sql)
+    return sql, params
+
+
 class Select(_Select):
     def __init__(self, connection: _Connection, *args):
         super().__init__(*args)
         self.__connection = connection
 
     def execute(self):
+        sql, params = _to_pymysql(self.sql, self.params)
         cursor = self.__connection.cursor()
-        cursor.execute(self.sql, self.params)
+        cursor.execute(sql, params)
         return cursor
 
     def fetchone(self):
+        sql, params = _to_pymysql(self.sql, self.params)
         with self.__connection.cursor() as cursor:
-            cursor.execute(self.sql, self.params)
+            cursor.execute(sql, params)
             result = cursor.fetchone()
         return result
 
     def fetchall(self):
+        sql, params = _to_pymysql(self.sql, self.params)
         with self.__connection.cursor() as cursor:
-            cursor.execute(self.sql, self.params)
+            cursor.execute(sql, params)
             result = cursor.fetchall()
         return result
 
@@ -36,8 +48,9 @@ class Insert(_Insert):
         self.__connection = connection
 
     def execute(self) -> int:
+        sql, params = _to_pymysql(self.sql, self.params)
         with self.__connection.cursor() as cursor:
-            cursor.execute(self.sql, self.params)
+            cursor.execute(sql, params)
             return cursor.rowcount
 
 
@@ -47,8 +60,9 @@ class Update(_Update):
         self.__connection = connection
 
     def execute(self) -> int:
+        sql, params = _to_pymysql(self.sql, self.params)
         with self.__connection.cursor() as cursor:
-            cursor.execute(self.sql, self.params)
+            cursor.execute(sql, params)
             return cursor.rowcount
 
 
@@ -58,8 +72,9 @@ class Delete(_Delete):
         self.__connection = connection
 
     def execute(self) -> int:
+        sql, params = _to_pymysql(self.sql, self.params)
         with self.__connection.cursor() as cursor:
-            cursor.execute(self.sql, self.params)
+            cursor.execute(sql, params)
             return cursor.rowcount
 
 

{sqlqb-0.1.3 → sqlqb-0.1.4}/src/sqlqb/select.py

@@ -7,6 +7,7 @@ class Select:
         self.__table: str | None = None
         self.__wheres: list[str] = []
         self.__params: list = []
+        self.__named_params: dict = {}
         self.__joins: list[str] = []
         self.__orderby: list[tuple[str, str]] = []
         self.__groupby: list[str] = []
@@ -25,14 +26,32 @@ class Select:
         self.__table = table
         return self
 
-    def Join(self, join: str, *args) -> "Select":
+    def Join(self, join: str, *args, **kwargs) -> "Select":
+        if args and kwargs:
+            raise ValueError("error: cannot mix positional and named params")
+        if args and self.__named_params:
+            raise ValueError("error: cannot mix positional and named params")
+        if kwargs and self.__params:
+            raise ValueError("error: cannot mix positional and named params")
         self.__joins.append(join)
-        self.__params += args
+        if kwargs:
+            self.__named_params.update(kwargs)
+        else:
+            self.__params += list(args)
         return self
 
-    def Where(self, condition: str, *args) -> "Select":
+    def Where(self, condition: str, *args, **kwargs) -> "Select":
+        if args and kwargs:
+            raise ValueError("error: cannot mix positional and named params")
+        if args and self.__named_params:
+            raise ValueError("error: cannot mix positional and named params")
+        if kwargs and self.__params:
+            raise ValueError("error: cannot mix positional and named params")
         self.__wheres.append(condition)
-        self.__params += args
+        if kwargs:
+            self.__named_params.update(kwargs)
+        else:
+            self.__params += list(args)
         return self
 
     def OrderBy(self, column: str, direction: str = "ASC") -> "Select":
@@ -54,7 +73,9 @@ class Select:
         return self
 
     @property
-    def params(self) -> list:
+    def params(self) -> list | dict:
+        if self.__named_params:
+            return self.__named_params
         return self.__params
 
     @property
@@ -62,8 +83,9 @@ class Select:
         sql = io.StringIO()
         sql.write("SELECT ")
         sql.write(", ".join(self.__columns or "*"))
-        sql.write(" FROM ")
-        sql.write(self.__table)
+        if self.__table:
+            sql.write(" FROM ")
+            sql.write(self.__table)
         if self.__joins:
             sql.write(" ")
             sql.write(" ".join(self.__joins))

{sqlqb-0.1.3 → sqlqb-0.1.4}/src/sqlqb/sqlalchemy/__init__.py

@@ -9,8 +9,10 @@ from sqlqb import Update as _Update
 from sqlqb import Delete as _Delete
 
 
-def _bind(sql: str, params: list) -> tuple[str, dict]:
-    """Replace ? placeholders with :p0, :p1, ... for SQLAlchemy text()."""
+def _bind(sql: str, params: list | dict) -> tuple[str, dict]:
+    """Convert params for SQLAlchemy text(): pass dicts through, replace ? with :p0/:p1/... for lists."""
+    if isinstance(params, dict):
+        return sql, params
     named: dict = {}
     for i, val in enumerate(params):
         key = f"p{i}"

{sqlqb-0.1.3 → sqlqb-0.1.4}/src/sqlqb/update.py

@@ -9,6 +9,7 @@ class Update:
         self.__sets: dict[str, object] = {}
         self.__wheres: list[str] = []
         self.__where_params: list = []
+        self.__where_named_params: dict = {}
         self.__limit: int | None = None
 
     def Set(self, **kwargs) -> "Update":
@@ -17,9 +18,18 @@ class Update:
         self.__sets.update(kwargs)
         return self
 
-    def Where(self, condition: str, *args) -> "Update":
+    def Where(self, condition: str, *args, **kwargs) -> "Update":
+        if args and kwargs:
+            raise ValueError("error: cannot mix positional and named params")
+        if args and self.__where_named_params:
+            raise ValueError("error: cannot mix positional and named params")
+        if kwargs and self.__where_params:
+            raise ValueError("error: cannot mix positional and named params")
         self.__wheres.append(condition)
-        self.__where_params += args
+        if kwargs:
+            self.__where_named_params.update(kwargs)
+        else:
+            self.__where_params += list(args)
         return self
 
     def Limit(self, limit: int) -> "Update":
@@ -27,9 +37,13 @@ class Update:
         return self
 
     @property
-    def params(self) -> list:
+    def params(self) -> list | dict:
         if not self.__sets:
             return []
+        if self.__where_named_params:
+            named = dict(self.__sets)
+            named.update(self.__where_named_params)
+            return named
         return list(self.__sets.values()) + self.__where_params
 
     @property
@@ -40,7 +54,10 @@ class Update:
         sql.write("UPDATE ")
         sql.write(self.__table)
         sql.write(" SET ")
-        sql.write(", ".join([f"{col} = ?" for col in self.__sets]))
+        if self.__where_named_params:
+            sql.write(", ".join([f"{col} = :{col}" for col in self.__sets]))
+        else:
+            sql.write(", ".join([f"{col} = ?" for col in self.__sets]))
         if self.__wheres:
             sql.write(" WHERE ")
             sql.write(" AND ".join(self.__wheres))

sqlqb-0.1.3/tests/test_sqlite.py → sqlqb-0.1.4/tests/test_sqlite3.py

@@ -1,11 +1,11 @@
 import pytest
 
-from sqlqb import sqlite
+from sqlqb import sqlite3
 
 
 @pytest.fixture
 def conn():
-    c = sqlite.connect(":memory:")
+    c = sqlite3.connect(":memory:")
     c.execute("CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT, age INTEGER)")
     c.executemany("INSERT INTO users VALUES (?, ?, ?)", [(1, "Alice", 30), (2, "Bob", 17), (3, "Carol", 25)])
     c.commit()
@@ -101,7 +101,7 @@ class TestDelete:
 
     def test_delete_with_limit_not_supported(self, conn):
         # NOTE: sqlite library of python does not support LIMIT in delete queries
-        import sqlite3
+        import sqlite3 as stdlib_sqlite3
 
-        with pytest.raises(sqlite3.OperationalError):
+        with pytest.raises(stdlib_sqlite3.OperationalError):
             conn.Delete().From("users").Limit(2).execute()

{sqlqb-0.1.3 → sqlqb-0.1.4}/uv.lock

@@ -293,7 +293,7 @@ wheels = [
 
 [[package]]
 name = "sqlqb"
-version = "0.1.3"
+version = "0.1.4"
 source = { editable = "." }
 
 [package.dev-dependencies]