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

sql_blocks/sql_blocks.py

@@ -121,7 +121,8 @@ class SQLObject:
 
 SQL_CONST_SYSDATE = 'SYSDATE'
 SQL_CONST_CURR_DATE = 'Current_date'
-SQL_CONSTS = [SQL_CONST_SYSDATE, SQL_CONST_CURR_DATE]
+SQL_ROW_NUM = 'ROWNUM'
+SQL_CONSTS = [SQL_CONST_SYSDATE, SQL_CONST_CURR_DATE, SQL_ROW_NUM]
 
 
 class Field:
@@ -282,14 +283,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 +563,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
@@ -625,7 +655,7 @@ class Rule:
         ...
 
 class QueryLanguage:
-    pattern = '{select}{_from}{where}{group_by}{order_by}'
+    pattern = '{select}{_from}{where}{group_by}{order_by}{limit}'
     has_default = {key: bool(key == SELECT) for key in KEYWORD}
 
     @staticmethod
@@ -653,13 +683,16 @@ class QueryLanguage:
     def set_group(self, values: list) -> str:
         return  self.join_with_tabs(values, ',')
 
+    def set_limit(self, values: list) -> str:
+        return self.join_with_tabs(values, ' ')
+
     def __init__(self, target: 'Select'):
-        self.KEYWORDS = [SELECT, FROM, WHERE, GROUP_BY, ORDER_BY]
+        self.KEYWORDS = [SELECT, FROM, WHERE, GROUP_BY, ORDER_BY, LIMIT]
         self.TABULATION = '\n\t' if target.break_lines else ' '
         self.LINE_BREAK = '\n' if target.break_lines else ' '
         self.TOKEN_METHODS = {
             SELECT: self.add_field, FROM: self.get_tables, 
-            WHERE: self.extract_conditions,
+            WHERE: self.extract_conditions, LIMIT: self.set_limit,
             ORDER_BY: self.sort_by, GROUP_BY: self.set_group,
         }
         self.result = {}
@@ -1308,10 +1341,21 @@ class Select(SQLObject):
         return True
 
     def limit(self, row_count: int=100, offset: int=0):
-        result = [str(row_count)]
-        if offset > 0:
-            result.append(f'OFFSET {offset}')
-        self.values.setdefault(LIMIT, result)
+        if Function.dialect == Dialect.SQL_SERVER:
+            fields = self.values.get(SELECT)
+            if fields:
+                fields[0] = f'SELECT TOP({row_count}) {fields[0]}'
+            else:
+                self.values[SELECT] = [f'SELECT TOP({row_count}) *']
+            return self
+        if Function.dialect == Dialect.ORACLE:
+            Where.gte(row_count).add(SQL_ROW_NUM, self)
+            if offset > 0:
+                Where.lte(row_count+offset).add(SQL_ROW_NUM, self)
+            return self
+        self.values[LIMIT] = ['{}{}'.format(
+            row_count, f' OFFSET {offset}' if offset > 0 else ''
+        )]
         return self
 
     def match(self, field: str, key: str) -> bool:
@@ -1475,7 +1519,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,6 +1535,8 @@ 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
@@ -1498,15 +1544,14 @@ def detect(text: str) -> Select:
 
 
 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('#######################################')
+    for dialect in Dialect:
+        Function.dialect = dialect
+        print(f'--------------{dialect.name}--------------')
+        query = Select(
+            'Installments',
+            _=DateDiff(
+                Current_Date(),
+                'due_date'
+            ).As('elapsed_time')
+        ).limit(10)
+        print(query)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.113
+Version: 1.25.1801
 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.1801.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=iFS3drlQaazFkbBBFIH58RPZt4Lhe6R2Xqi_Ujef7Bg,51893
+sql_blocks-1.25.1801.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.1801.dist-info/METADATA,sha256=WnwFnhle4YXNyeC6dBVAnQmUqJiboT1CDhbvRHOmEQY,15027
+sql_blocks-1.25.1801.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.1801.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.1801.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,,