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

sql_blocks/sql_blocks.py

@@ -2203,14 +2203,25 @@ class CTEFactory:
         Table1(field, `function$`field`:alias`, `group@`) <- Table2(field)
         `...`MainTable(field)
         """
-        self.main = None
         if parser_class(txt) == CypherParser:
-            if '...' in txt:
-                txt, other = txt.split('...')
-                self.main = detect(other)
-                alias = self.main.table_name
+            txt, main_script = txt.split('...')
             query_list = Select.parse(txt, CypherParser)
-            if not self.main:
+            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
@@ -2439,6 +2450,6 @@ if __name__ == "__main__":
         #  |                                                                           |
         #  +--- The Sales table                                                        |
         #                               Also groups by vendor´s name ------------------+ 
-        "...Annual_Sales_per_Vendor(ref_year, qty_sold, vendors_name, *) -> Goal(year, target)"
+        "...Annual_Sales_per_Vendor(*) -> Goal(year, target)"
     )
     print(cte)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.20250712
+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
@@ -995,7 +995,14 @@ results...
 
 #### 17.3.1 - You can also pass a Cypher script like in the example below:
 
-![image](assets/CTEFactory.png)
+    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...
 ```

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.20250712.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=A-i1B6jUA6_SYRfZAA65mhqHMkSQApXO7NcmIt3O5O8,83911
-sql_blocks-1.20250712.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.20250712.dist-info/METADATA,sha256=Kj2I_aL5fxL2bxn3hoj8hb54kKDt3M510VDn8mGmA7o,25079
-sql_blocks-1.20250712.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.20250712.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.20250712.dist-info/RECORD,,