sql-blocks 1.25.32011301__py3-none-any.whl → 1.25.33022255__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -1135,7 +1135,13 @@ class CypherParser(Parser):
                 Count().As(token, extra_classes).add(pk_field, self.queries[-1])
                 return
             else:
-                class_list = [ FUNCTION_CLASS[func_name] ]
+                class_type = FUNCTION_CLASS.get(func_name)
+                if not class_type:
+                    raise ValueError(f'Unknown function `{func_name}`.')
+                if ':' in token:
+                    token, field_alias = token.split(':')
+                    class_type = class_type().As(field_alias)
+                class_list = [class_type]
         class_list += extra_classes
         FieldList(token, class_list).add('', self.queries[-1])
 
@@ -1504,6 +1510,17 @@ class CTE(Select):
                 justify(q) for q in self.query_list
             ), super().__str__()
         )
+    def join(self, pattern: str, fields: list | str, format: str):
+        if isinstance(fields, str):
+            count = len( fields.split(',') )
+        else:
+            count = len(fields)
+        queries = detect(
+            pattern*count, join_queries=False, format=format
+        )
+        FieldList(fields, queries, ziped=True).add('', self)
+        self.break_lines = True
+        return self
 
 class Recursive(CTE):
     prefix = 'RECURSIVE '
@@ -1535,23 +1552,13 @@ class Recursive(CTE):
         Where.formula(formula).add(foreign_key or pk_field, t2)
         return cls(name, [t1, t2])
 
-    def join(self, pattern: str, fields: list | str, format: str):
-        if isinstance(fields, str):
-            count = len( fields.split(',') )
-        else:
-            count = len(fields)
-        queries = detect(
-            pattern*count, join_queries=False, format=format
-        )
-        FieldList(fields, queries, ziped=True).add('', self)
-        self.break_lines = True
-
     def counter(self, name: str, start, increment: str='+1'):
         for i, query in enumerate(self.query_list):
             if i == 0:
                 Field.add(f'{start} AS {name}', query)
             else:
                 Field.add(f'({name}{increment}) AS {name}', query)
+        return self
 
 
 # ----- Rules -----
@@ -1697,3 +1704,9 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
     return result
 
 
+if __name__ == "__main__":
+    CAMPO_MEDIA = 'MEDIA_SALARIAL_DEPTO'
+    employees = detect(
+        f'Employees@department_id(avg$salary:{CAMPO_MEDIA})'
+    )
+    print(employees)

{sql_blocks-1.25.32011301.dist-info → sql_blocks-1.25.33022255.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=orYGCD6mnYmPZT4xzLXMy8Na_nwUdAe0HxsVPeas6LM,57510
+sql_blocks-1.25.33022255.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.33022255.dist-info/METADATA,sha256=mOP6W7LDKvEHlfrZUVooyBwYs1A9a55K9bpLQpVt2N0,19574
+sql_blocks-1.25.33022255.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.33022255.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.33022255.dist-info/RECORD,,

sql_blocks-1.25.32011301.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=VW8n2nWu7RREnns8dmYruhlvzGBCA3EeuBKiXCjClmE,56975
-sql_blocks-1.25.32011301.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.32011301.dist-info/METADATA,sha256=g_Yr5mTcquKqG5PM6qSNeWsuZ4wbo88pdZUldp_rt9k,19574
-sql_blocks-1.25.32011301.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.32011301.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.32011301.dist-info/RECORD,,