sqlengine-lite 2.2.2__tar.gz → 2.2.3__tar.gz

{sqlengine_lite-2.2.2/src/sqlengine_lite.egg-info → sqlengine_lite-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlengine-lite
-Version: 2.2.2
+Version: 2.2.3
 Summary: Cute sqlite3 wrapper for sql tables
 Project-URL: Homepage, https://github.com/suffermuffin/SQL-Engine
 Project-URL: Repository, https://github.com/suffermuffin/SQL-Engine.git

{sqlengine_lite-2.2.2 → sqlengine_lite-2.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlengine-lite"
-version = "2.2.2"
+version = "2.2.3"
 description = "Cute sqlite3 wrapper for sql tables"
 readme = "README.md"
 requires-python = ">=3.12"

{sqlengine_lite-2.2.2 → sqlengine_lite-2.2.3}/src/sqlengine/_internal/sqlgen.py

@@ -68,6 +68,7 @@ def select(
       tablename   : str,
       columns     : str | list[str]  = "*",
       where_clause: str | None       = None,
+      group_by    : str | None       = None,
       order_by    : str | None       = None,
       limit       : int | str | None = None
     ) -> str: 
@@ -77,6 +78,7 @@ def select(
     
     query  = f"SELECT {_columns} FROM {tablename}"
     query += f" WHERE {where_clause}" if where_clause else ""
+    query += f" GROUP BY {group_by}"  if group_by     else ""
     query += f" ORDER BY {order_by}"  if order_by     else ""
     query += f" LIMIT {limit}"        if limit        else ""
     query += ";"

{sqlengine_lite-2.2.2 → sqlengine_lite-2.2.3}/src/sqlengine/_internal/statements.py

@@ -229,6 +229,7 @@ class Select(Statement):
         
         self._columns   : list[str] = []
         self._order_by  : list[str] = []
+        self._group_by  : list[str] = []
         self._aggregate : str | None = None
         self._limit     : int | None = None
 
@@ -254,12 +255,18 @@ class Select(Statement):
 
     
     def order_by(self, column : str, ascending : bool = True) -> Self:
-        """ Orders returned rows by provided column """
+        """ Order returned rows by provided column """
         order = "ASC" if ascending else "DESC"
         self._order_by.append(f"{column} {order}")
         return self
     
 
+    def group_by(self, *columns : str) -> Self:
+        """ Group by provided columns """
+        self._group_by.extend(columns)
+        return self
+    
+
     def limit(self, n : int) -> Self:
         """ Limit number of returned rows """
         self._limit = n
@@ -340,8 +347,9 @@ class Select(Statement):
 
     def _build(self, where_clause : str, *args : SqlValue) -> tuple[str, tuple[SqlValue, ...]]:
 
-        order   = sql.format_list(self._order_by, brackets=False)
-        columns = sql.format_list(self._columns,  brackets=False)
+        order   = sql.format_list(self._order_by, brackets=False) if self._order_by else None
+        group   = sql.format_list(self._group_by, brackets=False) if self._group_by else None
+        columns = sql.format_list(self._columns,  brackets=False) if self._columns  else None
         
         columns = "*" if not columns else columns
         columns = columns if not self._aggregate else f"{self._aggregate}({columns})"
@@ -353,7 +361,14 @@ class Select(Statement):
         else:
             limit = None
         
-        query = sql.select(self._tableschema["tablename"], columns, where_clause, order, limit)
+        query = sql.select(
+            tablename   = self._tableschema["tablename"], 
+            columns     = columns, 
+            where_clause= where_clause, 
+            order_by    = order, 
+            group_by    = group,
+            limit       = limit,
+        )
         
         return query, args
     
@@ -361,6 +376,7 @@ class Select(Statement):
     def _reset(self) -> None:
         self._columns   = []
         self._order_by  = []
+        self._group_by  = []
         self._aggregate = None
         self._limit     = None
 
@@ -428,4 +444,5 @@ class Update(MutationalStatement):
     
     def _reset(self) -> None:
         self._set_clauses = []
-        self._set_args = []
+        self._set_args = []
+        

{sqlengine_lite-2.2.2 → sqlengine_lite-2.2.3/src/sqlengine_lite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlengine-lite
-Version: 2.2.2
+Version: 2.2.3
 Summary: Cute sqlite3 wrapper for sql tables
 Project-URL: Homepage, https://github.com/suffermuffin/SQL-Engine
 Project-URL: Repository, https://github.com/suffermuffin/SQL-Engine.git