sql-blocks 1.20250711__py3-none-any.whl → 1.20250713__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -336,6 +336,10 @@ class Round(Function):
     inputs = [FLOAT]
     output = FLOAT
 
+class Trunc(Function):
+    inputs = [FLOAT]
+    output = FLOAT
+
 # --- Date Functions: ------------------------------------
 class DateDiff(Function):
     inputs = [DATE]
@@ -1681,8 +1685,11 @@ class CypherParser(Parser):
         if token in self.TOKEN_METHODS:
             return
         if '*' in token:
-            token = token.replace('*', '')
-            self.queries[-1].key_field = token
+            pk_field = token.replace('*', '')
+            if not pk_field.isidentifier():
+                pos = int(pk_field or '1')-1
+                pk_field = self.queries[-1].values[SELECT][pos]
+            self.queries[-1].key_field = pk_field.split('.')[-1]
             return
         # -------------------------------------------------------
         def field_params() -> dict:
@@ -1706,6 +1713,8 @@ class CypherParser(Parser):
             if group:
                 if not field:
                     field = group
+                elif not alias:
+                    alias = group
                 extra_classes += [GroupBy]
             if function:                
                 if is_count and not field:
@@ -1713,7 +1722,9 @@ class CypherParser(Parser):
                 class_type = FUNCTION_CLASS.get(function)
                 if not class_type:
                     raise ValueError(f'Unknown function `{function}`.')
-                class_list = [ class_type().As(alias or group, extra_classes) ]
+                class_list = [ class_type().As(alias, extra_classes) ]
+            elif alias:
+                class_list = [NamedField(alias)] + extra_classes
             else:
                 class_list = [Field] + extra_classes
             FieldList(field, class_list).add('', self.queries[-1])
@@ -2181,17 +2192,39 @@ MAIN_TAG = '__main__'
 class CTEFactory:
     def __init__(self, txt: str):
         """
-        Syntax:
+        SQL syntax:
         ---
-        **SELECT ...
+        **SELECT field, field
         FROM** ( `sub_query1` ) **AS** `alias_1`
         JOIN ( `sub_query2` ) **AS** `alias_2` **ON** `__join__`
+        
+        Cypher syntax:
+        ---
+        Table1(field, `function$`field`:alias`, `group@`) <- Table2(field)
+        `...`MainTable(field)
         """
         if parser_class(txt) == CypherParser:
+            txt, main_script = txt.split('...')
             query_list = Select.parse(txt, CypherParser)
-            alias = '_'.join(query.table_name for query in query_list)
-            self.main = Select(alias)
-            self.main.break_lines = False
+            if main_script:
+                main_script = ''.join(main_script)
+                if '(*)' in main_script:
+                    field_list = [
+                        re.split(
+                            r'\bas\b|\bAS\b', field
+                        )[-1].strip()
+                        for query in query_list
+                        for field in query.values.get(SELECT, [])
+                    ]
+                    main_script = main_script.replace('(*)', '({}, *)'.format(
+                        ','.join(field_list)
+                    ))
+                self.main = detect(main_script)
+                alias = self.main.table_name
+            else:
+                alias = '_'.join(query.table_name for query in query_list)
+                self.main = Select(alias)
+                self.main.break_lines = False
             query = join_queries(query_list)
             self.cte_list = [CTE(alias, [query])]
             return 
@@ -2405,17 +2438,18 @@ def detect(text: str, join_method = join_queries, format: str='') -> Select | li
 
 if __name__ == "__main__":
     cte = CTEFactory(
-        "Sales(year$ref_date:ref_year@, sum$quantity:qty_sold, vendor) <- Vendor(id, name@)"
+        "Sales(year$ref_date:ref_year@, sum$quantity:qty_sold, vendor) <- Vendor(id, name:vendors_name@)"
         # ^^^   ^^^           ^^^
         #  |     |             |                                       ^^^            ^^^
         #  |     |             |                                        |              |
-        #  |     |             |         Relaciona Sales com Vendor ----+              |
+        #  |     |             |         Relate Sales to Vendor --------+              |
         #  |     |             |                                                       |
-        #  |     |             +---- Chama de `ref_year` e agrupa                      |
+        #  |     |             +---- Call it `ref_year` and group it                   |
         #  |     |                                                                     |
-        #  |     +-- Extrai o ano do campo `ref_date`                                  |
+        #  |     +-- Extracts the year from the `ref_date` field                       |
         #  |                                                                           |
-        #  +--- Tabela de vendas                                                       |
-        #                             Agrupa também pelo nome do vendedor -------------+ 
+        #  +--- The Sales table                                                        |
+        #                               Also groups by vendor´s name ------------------+ 
+        "...Annual_Sales_per_Vendor(*) -> Goal(year, target)"
     )
     print(cte)

{sql_blocks-1.20250711.dist-info → sql_blocks-1.20250713.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.20250711
+Version: 1.20250713
 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
@@ -948,7 +948,7 @@ R2 = Recursive.create(
 >> Note: Comments added later.
 ---
 
-### CTEFactory class
+### 17.3 - CTEFactory class
 CTEFactory exchanges subqueries for CTEs, simply by passing the text of the "dirty" query:
 
 *Example*:
@@ -992,4 +992,34 @@ results...
     ORDER BY
             u001.name
 ```
+
+#### 17.3.1 - You can also pass a Cypher script like in the example below:
+
+    cte = CTEFactory(
+        "Sales(year$ref_date:ref_year@, sum$quantity:qty_sold, vendor)"
+        " <- Vendor(id, name:vendors_name@)"
+        "...Annual_Sales_per_Vendor(*) -> Goal(year, target)"
+    )
+    print(cte)
+
+![image](https://raw.githubusercontent.com/julio-cascalles/sql_blocks/refs/heads/master/assets/CTEFactory.png)
+
+results...
+```
+WITH Annual_Sales_per_Vendor AS (
+    SELECT ven.name as vendors_name, Year(sal.ref_date) as ref_year
+    , Sum(sal.quantity) as qty_sold FROM Vendor ven LEFT JOIN Sales sal ON (ven.id = sal.vendor)
+    GROUP BY ven.name, ref_year
+)
+SELECT
+        aspv.ref_year,
+        aspv.qty_sold,
+        aspv.vendors_name,
+        goa.target
+FROM
+        Annual_Sales_per_Vendor aspv
+        RIGHT JOIN Goal goa ON (aspv.ref_year = goa.year)
+```
+
+
 ---

sql_blocks-1.20250713.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=h5toXPu_0Nw9VaifIXAVlLBOKAv1Oz2Iw2kQSVEbk4Y,84392
+sql_blocks-1.20250713.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.20250713.dist-info/METADATA,sha256=OnjjmdmJU39ADp7D1IS6FmC020iIqguDP1MbkKCdJtg,25388
+sql_blocks-1.20250713.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.20250713.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.20250713.dist-info/RECORD,,

sql_blocks-1.20250711.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=JHQ0CzciUEodZoA0WjUYKDpC2VZWcFlDB9C2wrNc4rA,83004
-sql_blocks-1.20250711.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.20250711.dist-info/METADATA,sha256=fci6o5QrXStVrXylRQ7QaCpO9jid0P6eON6xMK4Rob0,24486
-sql_blocks-1.20250711.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.20250711.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.20250711.dist-info/RECORD,,