sql-blocks 1.25.111__tar.gz → 1.25.112__tar.gz

{sql_blocks-1.25.111/sql_blocks.egg-info → sql_blocks-1.25.112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.111
+Version: 1.25.112
 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
@@ -614,6 +614,12 @@ You may use this functions:
 * Max
 * Sum
 * Count
+* Lag
+* Lead
+* Row_Number
+* Rank
+* Coalesce
+* Cast
 > Some of these functions may vary in syntax depending on the database.
 For example, if your query is going to run on Oracle, do the following:
 

{sql_blocks-1.25.111 → sql_blocks-1.25.112}/README.md

@@ -599,6 +599,12 @@ You may use this functions:
 * Max
 * Sum
 * Count
+* Lag
+* Lead
+* Row_Number
+* Rank
+* Coalesce
+* Cast
 > Some of these functions may vary in syntax depending on the database.
 For example, if your query is going to run on Oracle, do the following:
 

{sql_blocks-1.25.111 → sql_blocks-1.25.112}/pyproject.toml

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

{sql_blocks-1.25.111 → sql_blocks-1.25.112}/setup.py

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

{sql_blocks-1.25.111 → sql_blocks-1.25.112}/sql_blocks/sql_blocks.py

@@ -266,23 +266,38 @@ class Current_Date(Function):
         return super().get_pattern()
 # --------------------------------------------------------
 
-class Aggregate:
+class Frame:
     break_lines: bool = True
 
     def over(self, **args):
-        keywords = ' '.join(
-            '{}{} BY {}'.format(
-                '\n\t\t' if self.break_lines else '',
-                key.upper(), args[key]
-            ) for key in ('partition', 'order')
-            if key in args
-        )
+        """
+        How to use:
+            over(field1=OrderBy, field2=Partition)
+        """
+        keywords = ''
+        for field, obj in args.items():
+            is_valid = any([
+                obj is class_type # or isinstance(obj, class_type)
+                for class_type in (OrderBy, Partition)
+            ])
+            if not is_valid:
+                continue
+            keywords += '{}{} {}'.format(
+                '\n\t\t' if self.break_lines else ' ',
+                obj.cls_to_str(), field
+            )
         if keywords and self.break_lines:
             keywords += '\n\t'
         self.pattern = self.get_pattern() + f' OVER({keywords})'
         return self
 
 
+class Aggregate(Frame):
+    ...
+
+class Window(Frame):
+    ...
+
 # ---- Aggregate Functions: -------------------------------
 class Avg(Aggregate, Function):
     ...
@@ -295,6 +310,17 @@ class Sum(Aggregate, Function):
 class Count(Aggregate, Function):
     ...
 
+# ---- Window Functions: -----------------------------------
+class Row_Number(Window, Function):
+    ... 
+class Rank(Window, Function):
+    ... 
+class Lag(Window, Function):
+    ...
+class Lead(Window, Function):
+    ...
+
+
 # ---- Conversions and other Functions: ---------------------
 class Coalesce(Function):
     ...
@@ -539,6 +565,16 @@ class OrderBy(Clause):
         name = cls.format(name, main)
         main.values.setdefault(ORDER_BY, []).append(name+cls.sort.value)
 
+    @classmethod
+    def cls_to_str(cls) -> str:
+        return ORDER_BY
+
+PARTITION_BY = 'PARTITION BY'
+class Partition:
+    @classmethod
+    def cls_to_str(cls) -> str:
+        return PARTITION_BY
+
 
 class GroupBy(Clause):
     @classmethod
@@ -1446,14 +1482,3 @@ def detect(text: str) -> Select:
     return result
 
 
-if __name__ == "__main__":
-    query = Select(
-        'Installments i', due_date=Field,  customer=Select(
-            'Customer c', id=PrimaryKey,
-            name=contains('Smith', Position.EndsWith)
-        )
-    )
-    print(query)
-    print('-----')
-    query.optimize([RuleReplaceJoinBySubselect])
-    print(query)

{sql_blocks-1.25.111 → sql_blocks-1.25.112/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.111
+Version: 1.25.112
 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
@@ -614,6 +614,12 @@ You may use this functions:
 * Max
 * Sum
 * Count
+* Lag
+* Lead
+* Row_Number
+* Rank
+* Coalesce
+* Cast
 > Some of these functions may vary in syntax depending on the database.
 For example, if your query is going to run on Oracle, do the following: