sql-blocks 1.25.113__py3-none-any.whl → 1.25.1301__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -282,14 +282,15 @@ class Frame:
         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)
+                obj is OrderBy,
+                obj is Partition,
+                isinstance(obj, Rows),
             ])
             if not is_valid:
                 continue
             keywords += '{}{} {}'.format(
                 '\n\t\t' if self.break_lines else ' ',
-                obj.cls_to_str(), field
+                obj.cls_to_str(), field if field != '_' else ''
             )
         if keywords and self.break_lines:
             keywords += '\n\t'
@@ -561,6 +562,34 @@ class SortType(Enum):
     ASC = ''
     DESC = ' DESC'
 
+class Row:
+    def __init__(self, value: int=0):
+        self.value = value
+
+    def __str__(self) -> str:
+        return '{} {}'.format(
+            'UNBOUNDED' if self.value == 0 else self.value,
+            self.__class__.__name__.upper()
+        )
+
+class Preceding(Row):
+    ...
+class Following(Row):
+    ...
+class Current(Row):
+    def __str__(self) -> str:
+        return 'CURRENT ROW'
+
+class Rows:
+    def __init__(self, *rows: list[Row]):
+        self.rows = rows
+
+    def cls_to_str(self) -> str:
+        return 'ROWS {}{}'.format(
+            'BETWEEN ' if len(self.rows) > 1 else '',
+            ' AND '.join(str(row) for row in self.rows)
+        )
+
 
 class OrderBy(Clause):
     sort: SortType = SortType.ASC
@@ -1475,7 +1504,7 @@ def parser_class(text: str) -> Parser:
     return None
 
 
-def detect(text: str) -> Select:    
+def detect(text: str, join_queries: bool = True) -> Select:
     from collections import Counter
     parser = parser_class(text)
     if not parser:
@@ -1491,22 +1520,9 @@ def detect(text: str) -> Select:
                 text = text[:begin] + new_name + '(' + text[end:]
                 count -= 1
     query_list = Select.parse(text, parser)
+    if not join_queries:
+        return query_list
     result = query_list[0]
     for query in query_list[1:]:
         result += query
     return result
-
-
-if __name__ == '__main__':
-    p, c, a = Select.parse('''
-    Professor(?nome="Júlio Cascalles", id)
-    <- Curso@disciplina(professor, aluno) ->
-    Aluno(id ^count$qtd_alunos)
-    ''', CypherParser)
-    query = p + c + a
-    print('#######################################')
-    print(query)
-    print('***************************************')
-    query.optimize([RuleReplaceJoinBySubselect])
-    print(query)
-    print('#######################################')

{sql_blocks-1.25.113.dist-info → sql_blocks-1.25.1301.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.113
+Version: 1.25.1301
 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
@@ -554,12 +554,18 @@ It consists of the inverse process of parsing: From a Select object, it returns
 ---
 ### 14 - Window Function
 
-Aggregation functions (Avg, Min, Max, Sum, Count) have the **over** method...
+Aggregation functions (Avg, Min, Max, Sum, Count) -- or Window functions (Lead, Lag, Row_Number, Rank) -- have the **over** method...
 
     query=Select(
         'Enrollment e',
         payment=Sum().over(
-            partition='student_id', order='due_date'
+            student_id=Partition, due_date=OrderBy,
+            # _=Rows(Current(), Following(5)), 
+               # ^^^-------> ROWS BETWEEN CURRENT ROW AND 5 FOLLOWING
+            # _=Rows(Preceding(3), Following()),
+               # ^^^-------> ROWS BETWEEN 3 PRECEDING AND UNBOUNDED FOLLOWING
+            # _=Rows(Preceding(3)) 
+               # ^^^-------> ROWS 3 PRECEDING
         ).As('sum_per_student')
     )
 

sql_blocks-1.25.1301.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=XDjB6YpjJ4ojsHylPt8jGCVt3dViFPKLzE_hbVJwNMo,50844
+sql_blocks-1.25.1301.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.1301.dist-info/METADATA,sha256=NqoWfNLGyyB32vgldi7qEC3xI6PiJ7Z25x6K5s8yyo0,15027
+sql_blocks-1.25.1301.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.1301.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.1301.dist-info/RECORD,,

sql_blocks-1.25.113.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=Saj3MqmF0OHY60bhc_aSl8fL-PhXM2apmiPiE6KspOc,50553
-sql_blocks-1.25.113.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.113.dist-info/METADATA,sha256=td1IZl9O3m2U0rWFk6gyecqWnkr0cMDW94PfeqhzP8Y,14638
-sql_blocks-1.25.113.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.113.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.113.dist-info/RECORD,,