sql-blocks 1.2025.625__py3-none-any.whl → 1.2025.627__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -2009,7 +2009,7 @@ class CTE(Select):
         # ---------------------------------------------------------
         return 'WITH {}{} AS (\n    {}\n){}'.format(
             self.prefix, self.table_name, 
-            '\nUNION ALL\n    '.join(
+            '\n\tUNION ALL\n    '.join(
                 justify(q) for q in self.query_list
             ), super().__str__() if self.show_query else ''
         )
@@ -2081,8 +2081,9 @@ class CTEFactory:
         self.cte_list = [
             CTE(alias, [
                 Select.parse(query)[0]
+                for query in elements
             ])
-            for alias, query in summary.items()
+            for alias, elements in summary.items()
         ]
 
     def __str__(self):
@@ -2091,8 +2092,20 @@ class CTEFactory:
         return ',\n'.join(lines) + '\n' + str(self.main)
 
     @staticmethod
-    def extract_subqueries(txt: str) -> dict:
+    def extract_subqueries(txt: str) -> dict:        
         result = {}
+        # ---------------------------------------------------
+        def clean_subquery(source: list) -> str:
+            while source:
+                if source[0].upper() == 'SELECT':
+                    break
+                word = source.pop(0)
+                if word.upper() in ('FROM', 'JOIN'):
+                    result[MAIN_TAG] += f' {word}'
+            return ' '.join(source)
+        def balanced_parentheses(expr: str) -> bool:
+            return expr.count('(') == expr.count(')')
+        # ---------------------------------------------------
         for found in re.finditer(r'(FROM|JOIN)\s*[(]\s*SELECT', txt, re.IGNORECASE):
             start = found.start()
             alias = ''
@@ -2102,16 +2115,23 @@ class CTEFactory:
                 if not found:
                     break
                 end = found.end() + pos
-                elements = txt[start: end].split()
-                if '(' not in elements[-3]:
-                    _, alias = elements[-2:]
+                last = end
+                if balanced_parentheses(txt[start: end]):
+                    pos += found.start()
+                    alias = re.findall(r'\s*(\w+)$', txt[pos: end])[0]
+                    end = pos
                 pos = end
-            first_word = elements.pop(0)
             if not result:
                 result[MAIN_TAG] = txt[:start]
-            result[MAIN_TAG] += f' {first_word} {alias} {alias}'
-            result[alias] = ' '.join(elements[1: -3])
-        result[MAIN_TAG] += txt[end:]
+            query_list = [
+                clean_subquery( expr.split() )
+                for expr in  re.split(
+                    r'\bUNION\b', txt[start: end], re.IGNORECASE
+                )
+            ]
+            result[MAIN_TAG] += f' {alias} {alias}'
+            result[alias] = query_list
+        result[MAIN_TAG] += txt[last:]
         return result
 
 

{sql_blocks-1.2025.625.dist-info → sql_blocks-1.2025.627.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=Eq2EMaVALy1IBGcjyjh7SaE1WZBPNvXCi748iCi6AtM,77469
+sql_blocks-1.2025.627.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.2025.627.dist-info/METADATA,sha256=n1Ju94eliblEldBRpj-VzmXg4_09K_vgT5hszgqqVS0,23328
+sql_blocks-1.2025.627.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.2025.627.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.2025.627.dist-info/RECORD,,

sql_blocks-1.2025.625.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=J7zEJ5JNRxI3F-7TIypb0myb5OgdE5Stv4boZCTVBLM,76610
-sql_blocks-1.2025.625.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.2025.625.dist-info/METADATA,sha256=I6KTi5S_usvCjJEQl6lm8LG4DaxHhX0NlGRwhHpKBT8,23328
-sql_blocks-1.2025.625.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.2025.625.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.2025.625.dist-info/RECORD,,