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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.630
+Version: 1.2025.702
 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

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

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

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

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

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

@@ -399,15 +399,15 @@ class Frame:
         keywords = ''
         for field, obj in args.items():
             is_valid = any([
-                obj is OrderBy,
+                obj is OrderBy, obj is DescOrderBy,
                 obj is Partition,
                 isinstance(obj, Rows),
             ])
             if not is_valid:
                 continue
-            keywords += '{}{} {}'.format(
+            keywords += '{}{}'.format(
                 '\n\t\t' if self.break_lines else ' ',
-                obj.cls_to_str(), field if field != '_' else ''
+                obj.cls_to_str(field if field != '_' else '')
             )
         if keywords and self.break_lines:
             keywords += '\n\t'
@@ -774,13 +774,18 @@ class If(Code, Frame):
         self.field = field
         self.condition = condition
         self.func_class = func_class
+        self.pattern = ''
         super().__init__()
 
     def format(self, name: str, main: SQLObject) -> str:
-        return '{func}({param})'.format(
+        return '{func}({param}){over}'.format(
             func=self.func_class.__name__,
-            param=Case(self.field).when(self.condition, f'={name}').else_value(0)
+            param=Case(self.field).when(self.condition, f'={name}').else_value(0),
+            over=self.pattern
         )
+    
+    def get_pattern(self) -> str:
+        return ''
 
 
 class Options:
@@ -881,7 +886,7 @@ class Rows:
     def __init__(self, *rows: list[Row]):
         self.rows = rows
 
-    def cls_to_str(self) -> str:
+    def cls_to_str(self, field: str='') -> str:
         return 'ROWS {}{}'.format(
             'BETWEEN ' if len(self.rows) > 1 else '',
             ' AND '.join(str(row) for row in self.rows)
@@ -894,6 +899,11 @@ class DescOrderBy:
         name = Clause.format(name, main)
         main.values.setdefault(ORDER_BY, []).append(name + SortType.DESC.value)
 
+    @classmethod
+    def cls_to_str(cls, field: str='') -> str:
+        return f"{ORDER_BY} {field} DESC"
+
+
 class OrderBy(Clause):
     sort: SortType = SortType.ASC
     DESC = DescOrderBy
@@ -918,14 +928,13 @@ class OrderBy(Clause):
         return super().format(name, main)
 
     @classmethod
-    def cls_to_str(cls) -> str:
-        return ORDER_BY
+    def cls_to_str(cls, field: str='') -> str:
+        return f"{ORDER_BY} {field}"
 
-PARTITION_BY = 'PARTITION BY'
 class Partition:
     @classmethod
-    def cls_to_str(cls) -> str:
-        return PARTITION_BY
+    def cls_to_str(cls, field: str) -> str:
+        return f'PARTITION BY {field}'
 
 
 class GroupBy(Clause):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.2025.630
+Version: 1.2025.702
 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