sql-blocks 1.2025.628__tar.gz → 1.2025.630__tar.gz

{sql_blocks-1.2025.628/sql_blocks.egg-info → sql_blocks-1.2025.630}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.628
+Version: 1.2025.630
 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
@@ -415,7 +415,7 @@ m2 = Select(
         )
     )
 
-10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
+* 10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
 
         query = Select(
             'People p',
@@ -440,6 +440,28 @@ is equivalent to...
         FROM
                 People p
 ```
+
+* 10.2 `If` class
+
+Usefull to conditional Sum, Avg, Count...
+
+**Example:**
+
+    Select('Emprestimo', 
+        taxa=If('atraso', gt(0), Sum)
+    )
+
+results...
+```
+SELECT
+        Sum(CASE
+                WHEN atraso > 0 THEN taxa
+                ELSE 0
+        END)
+FROM
+        Emprestimo
+```
+
 ---
 
 ### 11 - optimize method

{sql_blocks-1.2025.628 → sql_blocks-1.2025.630}/README.md

@@ -400,7 +400,7 @@ m2 = Select(
         )
     )
 
-10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
+* 10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
 
         query = Select(
             'People p',
@@ -425,6 +425,28 @@ is equivalent to...
         FROM
                 People p
 ```
+
+* 10.2 `If` class
+
+Usefull to conditional Sum, Avg, Count...
+
+**Example:**
+
+    Select('Emprestimo', 
+        taxa=If('atraso', gt(0), Sum)
+    )
+
+results...
+```
+SELECT
+        Sum(CASE
+                WHEN atraso > 0 THEN taxa
+                ELSE 0
+        END)
+FROM
+        Emprestimo
+```
+
 ---
 
 ### 11 - optimize method

{sql_blocks-1.2025.628 → sql_blocks-1.2025.630}/pyproject.toml

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

{sql_blocks-1.2025.628 → sql_blocks-1.2025.630}/setup.py

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

{sql_blocks-1.2025.628 → sql_blocks-1.2025.630}/sql_blocks/sql_blocks.py

@@ -210,6 +210,34 @@ class NamedField:
         )
 
 
+class Code:
+    def __init__(self):
+        # --- Replace class method by instance method: ------
+        self.add = self.__add
+        # -----------------------------------------------------
+        self.field_class = Field
+        self.extra = {}
+
+    def As(self, field_alias: str, modifiers=None):
+        if modifiers:
+            self.extra[field_alias] = TO_LIST(modifiers)
+        self.field_class = NamedField(field_alias)
+        return self
+    
+    def format(self, name: str, main: SQLObject) -> str:
+        raise NotImplementedError('Use child classes instead of this one')
+
+    def __add(self, name: str, main: SQLObject):
+        name = self.format(name, main)
+        self.field_class.add(name, main)
+        if self.extra:
+            main.__call__(**self.extra)
+
+    @classmethod
+    def add(cls, name: str, main: SQLObject):
+        cls().__add(name, main)
+
+
 class Dialect(Enum):
     ANSI = 0
     SQL_SERVER = 1
@@ -220,7 +248,7 @@ class Dialect(Enum):
 SQL_TYPES = 'CHAR INT DATE FLOAT ANY'.split()
 CHAR, INT, DATE, FLOAT, ANY  =  SQL_TYPES
 
-class Function:
+class Function(Code):
     dialect = Dialect.ANSI
     inputs = None
     output = None
@@ -241,24 +269,13 @@ class Function:
                 if unfriendly:
                     return Cast(func, main_param)
             return param
-        # --- Replace class methods by instance methods: ------
-        self.add = self.__add
-        self.format = self.__format
-        # -----------------------------------------------------
         self.params = [set_func_types(p) for p in params]
-        self.field_class = Field
         self.pattern = self.get_pattern()
-        self.extra = {}
+        super().__init__()
     
     def get_pattern(self) -> str:
         return '{func_name}({params})'
 
-    def As(self, field_alias: str, modifiers=None):
-        if modifiers:
-            self.extra[field_alias] = TO_LIST(modifiers)
-        self.field_class = NamedField(field_alias)
-        return self
-
     def __str__(self) -> str:
         return self.pattern.format(
             func_name=self.__class__.__name__,
@@ -288,24 +305,11 @@ class Function:
         else:
             self.params = new_params + self.params         
 
-    def __format(self, name: str, main: SQLObject) -> str:
+    def format(self, name: str, main: SQLObject) -> str:
         if name not in '*_':
             self.set_main_param(name, main)
         return str(self)
 
-    @classmethod
-    def format(cls, name: str, main: SQLObject):
-        return cls().__format(name, main)
-
-    def __add(self, name: str, main: SQLObject):
-        name = self.format(name, main)
-        self.field_class.add(name, main)
-        if self.extra:
-            main.__call__(**self.extra)
-
-    @classmethod
-    def add(cls, name: str, main: SQLObject):
-        cls().__add(name, main)
 
 
 # ---- String Functions: ---------------------------------
@@ -336,7 +340,6 @@ class DateDiff(Function):
             candidate = re.sub(
                 '[()]', '', obj.split('.')[-1]
             )
-            print(f'---------------> #{candidate=}#')
             return candidate.isidentifier()
         self.params = [
             p if is_field_or_func(p) else f"'{p}'"
@@ -676,7 +679,10 @@ class Case:
     
     def then(self, result):
         if isinstance(result, str):
-            result = quoted(result)
+            if result.startswith('='):
+                result = result[1:]
+            else:
+                result = quoted(result)
         self.__conditions[result] = self.current_condition
         return self
     
@@ -748,7 +754,10 @@ class Case:
         while tokens:
             word = tokens.pop(0)
             if last_word in KEYWORDS:
-                block = KEYWORDS[last_word](word)
+                try:
+                    block = KEYWORDS[last_word](word)
+                except:
+                    break
                 result += block.fields
                 block.fields = []
             elif word not in RESERVED_WORDS:
@@ -757,6 +766,23 @@ class Case:
         return result
 
 
+class If(Code, Frame):
+    """
+    Behaves like an aggregation function
+    """
+    def __init__(self, field: str, condition: Where, func_class: Function):
+        self.field = field
+        self.condition = condition
+        self.func_class = func_class
+        super().__init__()
+
+    def format(self, name: str, main: SQLObject) -> str:
+        return '{func}({param})'.format(
+            func=self.func_class.__name__,
+            param=Case(self.field).when(self.condition, f'={name}').else_value(0)
+        )
+
+
 class Options:
     def __init__(self, **values):
         self.__children: dict = values
@@ -916,7 +942,7 @@ class Having:
 
     def add(self, name: str, main:SQLObject):
         main.values[GROUP_BY][-1] += ' HAVING {} {}'.format(
-            self.function.format(name, main), self.condition.content
+            self.function().format(name, main), self.condition.content
         )
     
     @classmethod
@@ -2296,12 +2322,3 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
         result += query
     return result
 # ===========================================================================================//
-
-if __name__ == "__main__":
-    
-    print(
-        Select(
-            'Emprestimo e',
-            _=Sum(Case('atraso').when(gt(60), 25).when(lt(15), 5).else_value(10)).As('multa', OrderBy)
-        )
-    )

{sql_blocks-1.2025.628 → sql_blocks-1.2025.630/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.628
+Version: 1.2025.630
 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
@@ -415,7 +415,7 @@ m2 = Select(
         )
     )
 
-10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
+* 10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
 
         query = Select(
             'People p',
@@ -440,6 +440,28 @@ is equivalent to...
         FROM
                 People p
 ```
+
+* 10.2 `If` class
+
+Usefull to conditional Sum, Avg, Count...
+
+**Example:**
+
+    Select('Emprestimo', 
+        taxa=If('atraso', gt(0), Sum)
+    )
+
+results...
+```
+SELECT
+        Sum(CASE
+                WHEN atraso > 0 THEN taxa
+                ELSE 0
+        END)
+FROM
+        Emprestimo
+```
+
 ---
 
 ### 11 - optimize method