sql-blocks 1.2025.702__tar.gz → 1.2025.1002__tar.gz

{sql_blocks-1.2025.702/sql_blocks.egg-info → sql_blocks-1.2025.1002}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.702
+Version: 1.2025.1002
 Summary: Allows you to create objects for parts of SQL query commands. Also to combine these objects by joining them, adding or removing parts...
 Home-page: https://github.com/julio-cascalles/sql_blocks
 Author: Júlio Cascalles
@@ -447,15 +447,16 @@ Usefull to conditional Sum, Avg, Count...
 
 **Example:**
 
-    Select('Emprestimo', 
-        taxa=If('atraso', gt(0), Sum)
+    Select('Loan', 
+        penalty=If('days_late', Sum, gt(0))
     )
+    # ...OR... penalty=If('days_late > 0', Sum)
 
 results...
 ```
 SELECT
         Sum(CASE
-                WHEN atraso > 0 THEN taxa
+                WHEN days_late > 0 THEN penalty
                 ELSE 0
         END)
 FROM
@@ -794,6 +795,41 @@ SELECT
 ```
 ---
 
+### 16.1 - _GroupBy as instance_
+
+Another way to use GroupBy is to pass functions as parameters:
+
+```
+    Function.dialect = Dialect.ORACLE
+    query = Select(
+        'Sales s',
+        ref_date=GroupBy(
+            ref_year=Year, qty_sold=Sum('quantity'),
+            vendor=Select(
+                'Vendor v',
+                id=[PrimaryKey, Field], name=Field
+            )
+        )
+    )
+    print(query)
+```
+results..
+```
+SELECT
+        Extract(Year FROM s.ref_date) as ref_year,
+        Sum(quantity) as qty_sold,
+        v.id,
+        v.name
+FROM
+        Sales s
+        JOIN Vendor v ON (s.vendor = v.id)
+GROUP BY
+        ref_year,
+        v.id,
+        v.name
+```
+
+---
 ### 17 - CTE and Recursive classes
 
 * **17.1 - _CTE class_**

{sql_blocks-1.2025.702 → sql_blocks-1.2025.1002}/README.md

@@ -432,15 +432,16 @@ Usefull to conditional Sum, Avg, Count...
 
 **Example:**
 
-    Select('Emprestimo', 
-        taxa=If('atraso', gt(0), Sum)
+    Select('Loan', 
+        penalty=If('days_late', Sum, gt(0))
     )
+    # ...OR... penalty=If('days_late > 0', Sum)
 
 results...
 ```
 SELECT
         Sum(CASE
-                WHEN atraso > 0 THEN taxa
+                WHEN days_late > 0 THEN penalty
                 ELSE 0
         END)
 FROM
@@ -779,6 +780,41 @@ SELECT
 ```
 ---
 
+### 16.1 - _GroupBy as instance_
+
+Another way to use GroupBy is to pass functions as parameters:
+
+```
+    Function.dialect = Dialect.ORACLE
+    query = Select(
+        'Sales s',
+        ref_date=GroupBy(
+            ref_year=Year, qty_sold=Sum('quantity'),
+            vendor=Select(
+                'Vendor v',
+                id=[PrimaryKey, Field], name=Field
+            )
+        )
+    )
+    print(query)
+```
+results..
+```
+SELECT
+        Extract(Year FROM s.ref_date) as ref_year,
+        Sum(quantity) as qty_sold,
+        v.id,
+        v.name
+FROM
+        Sales s
+        JOIN Vendor v ON (s.vendor = v.id)
+GROUP BY
+        ref_year,
+        v.id,
+        v.name
+```
+
+---
 ### 17 - CTE and Recursive classes
 
 * **17.1 - _CTE class_**

{sql_blocks-1.2025.702 → sql_blocks-1.2025.1002}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sql_blocks"
-version = "1.2025.0702"
+version = "1.2025.1002"
 authors = [
   { name="Julio Cascalles", email="julio.cascalles@outlook.com" },
 ]

{sql_blocks-1.2025.702 → sql_blocks-1.2025.1002}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name = 'sql_blocks',
-    version = '1.2025.0702',
+    version = '1.2025.1002',
     author = 'Júlio Cascalles',
     author_email = 'julio.cascalles@outlook.com',
     packages = ['sql_blocks'],

{sql_blocks-1.2025.702 → sql_blocks-1.2025.1002}/sql_blocks/sql_blocks.py

@@ -272,6 +272,14 @@ class Function(Code):
         self.params = [set_func_types(p) for p in params]
         self.pattern = self.get_pattern()
         super().__init__()
+
+    @classmethod
+    def descendants(cls) -> list:
+        result = []
+        for sub in cls.__subclasses__():
+            result.append(sub)
+            result += sub.descendants()
+        return result
     
     def get_pattern(self) -> str:
         return '{func_name}({params})'
@@ -459,7 +467,7 @@ class Cast(Function):
     separator = ' As '
 
 
-FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.__subclasses__()}
+FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.descendants()}
 
 
 class ExpressionField:
@@ -770,8 +778,11 @@ class If(Code, Frame):
     """
     Behaves like an aggregation function
     """
-    def __init__(self, field: str, condition: Where, func_class: Function):
-        self.field = field
+    def __init__(self, field: str, func_class: Function, condition: Where=None):
+        if not condition:
+            field, *elements = re.split(r'([<>=]|\bin\b|\blike\b)', field, re.IGNORECASE)
+            condition = Where( ''.join(elements) )
+        self.field = field.strip()
         self.condition = condition
         self.func_class = func_class
         self.pattern = ''
@@ -938,10 +949,35 @@ class Partition:
 
 
 class GroupBy(Clause):
+    def __init__(self, **args):
+        # --- Replace class method by instance method: ------
+        self.add = self.__add
+        # -----------------------------------------------------
+        self.args = args
+
+    def __add(self, name: str, main: SQLObject):        
+        func: Function = None
+        fields = []
+        for alias, obj in self.args.items():
+            if isinstance(obj, type) and obj in Function.descendants():
+                func: Function = obj
+                name = func().format(name, main)
+                NamedField(alias).add(name, main)
+                fields += [alias]
+            elif isinstance(obj, Aggregate):
+                obj.As(alias).add('', main)
+            elif isinstance(obj, Select):
+                query: Select = obj
+                fields += query.values.get(SELECT, [])
+                query.add(alias, main)
+        if not func:
+            fields = [self.format(name, main)]
+        for field in fields:
+            main.values.setdefault(GROUP_BY, []).append(field)
+
     @classmethod
     def add(cls, name: str, main: SQLObject):
-        name = cls.format(name, main)
-        main.values.setdefault(GROUP_BY, []).append(name)
+        cls().__add(name, main)
 
 
 class Having:

{sql_blocks-1.2025.702 → sql_blocks-1.2025.1002/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.702
+Version: 1.2025.1002
 Summary: Allows you to create objects for parts of SQL query commands. Also to combine these objects by joining them, adding or removing parts...
 Home-page: https://github.com/julio-cascalles/sql_blocks
 Author: Júlio Cascalles
@@ -447,15 +447,16 @@ Usefull to conditional Sum, Avg, Count...
 
 **Example:**
 
-    Select('Emprestimo', 
-        taxa=If('atraso', gt(0), Sum)
+    Select('Loan', 
+        penalty=If('days_late', Sum, gt(0))
     )
+    # ...OR... penalty=If('days_late > 0', Sum)
 
 results...
 ```
 SELECT
         Sum(CASE
-                WHEN atraso > 0 THEN taxa
+                WHEN days_late > 0 THEN penalty
                 ELSE 0
         END)
 FROM
@@ -794,6 +795,41 @@ SELECT
 ```
 ---
 
+### 16.1 - _GroupBy as instance_
+
+Another way to use GroupBy is to pass functions as parameters:
+
+```
+    Function.dialect = Dialect.ORACLE
+    query = Select(
+        'Sales s',
+        ref_date=GroupBy(
+            ref_year=Year, qty_sold=Sum('quantity'),
+            vendor=Select(
+                'Vendor v',
+                id=[PrimaryKey, Field], name=Field
+            )
+        )
+    )
+    print(query)
+```
+results..
+```
+SELECT
+        Extract(Year FROM s.ref_date) as ref_year,
+        Sum(quantity) as qty_sold,
+        v.id,
+        v.name
+FROM
+        Sales s
+        JOIN Vendor v ON (s.vendor = v.id)
+GROUP BY
+        ref_year,
+        v.id,
+        v.name
+```
+
+---
 ### 17 - CTE and Recursive classes
 
 * **17.1 - _CTE class_**