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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.112
+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.112 → sql_blocks-1.25.1301}/README.md

@@ -539,12 +539,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.112 → sql_blocks-1.25.1301}/pyproject.toml

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

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

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

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

@@ -70,6 +70,10 @@ class SQLObject:
         appendix = {WHERE: r'\s+and\s+|', FROM: r'\s+join\s+|\s+JOIN\s+'}
         return KEYWORD[key][0].format(appendix.get(key, ''))
 
+    @staticmethod
+    def is_named_field(fld: str, key: str) -> bool:
+        return key == SELECT and re.search(r'\s+as\s+|\s+AS\s+', fld)
+
     def diff(self, key: str, search_list: list, exact: bool=False) -> set:
         def disassemble(source: list) -> list:
             if not exact:
@@ -82,12 +86,10 @@ class SQLObject:
             if exact:
                 fld = fld.lower()
             return fld.strip()
-        def is_named_field(fld: str) -> bool:
-            return key == SELECT and re.search(r'\s+as\s+|\s+AS\s+', fld)
         def field_set(source: list) -> set:
             return set(
                 (
-                    fld if is_named_field(fld) else
+                    fld if self.is_named_field(fld, key) else
                     re.sub(pattern, '', cleanup(fld))
                 )
                 for string in disassemble(source)
@@ -105,13 +107,16 @@ class SQLObject:
             return s1.symmetric_difference(s2)
         return s1 - s2
 
-    def delete(self, search: str, keys: list=USUAL_KEYS):
+    def delete(self, search: str, keys: list=USUAL_KEYS, exact: bool=False):
+        if exact:
+            not_match = lambda item: not re.search(fr'\w*[.]*{search}$', item)
+        else:
+            not_match = lambda item: search not in item
         for key in keys:
-            result = []
-            for item in self.values.get(key, []):
-                if search not in item:
-                    result.append(item)
-            self.values[key] = result
+            self.values[key] = [
+                item for item in self.values.get(key, [])
+                if not_match(item)
+            ]
 
 
 SQL_CONST_SYSDATE = 'SYSDATE'
@@ -277,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'
@@ -556,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
@@ -961,7 +995,7 @@ class SQLParser(Parser):
                     obj.values[key] = [
                         Field.format(fld, obj)
                         for fld in re.split(separator, values[key])
-                        if (fld != '*' and len(tables) == 1) or obj.match(fld)
+                        if (fld != '*' and len(tables) == 1) or obj.match(fld, key)
                     ]
                 result[obj.alias] = obj
         self.queries = list( result.values() )
@@ -1026,8 +1060,9 @@ class CypherParser(Parser):
             if func_name == 'count':
                 if not token:
                     token = 'count_1'
-                NamedField(token, Count).add('*', self.queries[-1])
-                class_list = []
+                pk_field = self.queries[-1].key_field or 'id'
+                Count().As(token, extra_classes).add(pk_field, self.queries[-1])
+                return
             else:
                 FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.__subclasses__()}
                 class_list = [ FUNCTION_CLASS[func_name] ]
@@ -1048,7 +1083,7 @@ class CypherParser(Parser):
             if not last.values.get(SELECT):
                 raise IndexError(f'Primary Key not found for {last.table_name}.')
             pk_field = last.values[SELECT][-1].split('.')[-1]
-            last.delete(pk_field, [SELECT])
+            last.delete(pk_field, [SELECT], exact=True)
         if '{}' in token:
             foreign_fld = token.format(
                 last.table_name.lower()
@@ -1063,12 +1098,11 @@ class CypherParser(Parser):
                 if fld not in curr.values.get(GROUP_BY, [])
             ]
             foreign_fld = fields[0].split('.')[-1]
-            curr.delete(foreign_fld, [SELECT])
+            curr.delete(foreign_fld, [SELECT], exact=True)
             if curr.join_type == JoinType.RIGHT:
                 pk_field, foreign_fld = foreign_fld, pk_field
         if curr.join_type == JoinType.RIGHT:
             curr, last = last, curr
-            # pk_field, foreign_fld = foreign_fld, pk_field
         k = ForeignKey.get_key(curr, last)
         ForeignKey.references[k] = (foreign_fld, pk_field)
 
@@ -1309,8 +1343,17 @@ class Select(SQLObject):
         self.values.setdefault(LIMIT, result)
         return self
 
-    def match(self, expr: str) -> bool:
-        return re.findall(f'\b*{self.alias}[.]', expr) != []
+    def match(self, field: str, key: str) -> bool:
+        '''
+        Recognizes if the field is from the current table
+        '''
+        if key in (ORDER_BY, GROUP_BY) and '.' not in field:
+            return any(
+                self.is_named_field(fld, SELECT)
+                for fld in self.values[SELECT]
+                if field in fld
+            )
+        return re.findall(f'\b*{self.alias}[.]', field) != []
 
     @classmethod
     def parse(cls, txt: str, parser: Parser = SQLParser) -> list[SQLObject]:
@@ -1431,12 +1474,13 @@ class RuleReplaceJoinBySubselect(Rule):
             more_relations = any([
                 ref[0] == query.table_name for ref in ForeignKey.references
             ])
-            invalid = any([
+            keep_join = any([
                 len( query.values.get(SELECT, []) ) > 0,
                 len( query.values.get(WHERE, []) ) == 0,
                 not fk_field, more_relations
             ])
-            if invalid:
+            if keep_join:
+                query.add(fk_field, main)
                 continue
             query.__class__ = SubSelect
             Field.add(primary_k, query)
@@ -1460,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:
@@ -1476,9 +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
-
-

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.112
+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')
     )