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

sql_blocks/sql_blocks.py

@@ -847,8 +847,15 @@ class Rows:
         )
 
 
+class DescOrderBy:
+    @classmethod
+    def add(cls, name: str, main: SQLObject):
+        name = Clause.format(name, main)
+        main.values.setdefault(ORDER_BY, []).append(name + SortType.DESC.value)
+
 class OrderBy(Clause):
     sort: SortType = SortType.ASC
+    DESC = DescOrderBy
 
     @classmethod
     def add(cls, name: str, main: SQLObject):
@@ -1973,13 +1980,12 @@ class NotSelectIN(SelectIN):
 
 class CTE(Select):
     prefix = ''
+    show_query = True
 
-    def __init__(self, table_name: str, query_list: list[Select]):
+    def __init__(self, table_name: str, query_list: list[Select]=[]):
         super().__init__(table_name)
-        for query in query_list:
-            query.break_lines = False
         self.query_list = query_list
-        self.break_lines = False
+        self.break_lines = False        
 
     def __str__(self) -> str:
         size = 0
@@ -1989,6 +1995,7 @@ class CTE(Select):
             self.break_lines = True
         # ---------------------------------------------------------
         def justify(query: Select) -> str:
+            query.break_lines = False
             result, line = [], ''
             keywords = '|'.join(KEYWORD)
             for word in re.split(fr'({keywords}|AND|OR|,)', str(query)):
@@ -2002,9 +2009,9 @@ 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__()
+            ), super().__str__() if self.show_query else ''
         )
 
     def join(self, pattern: str, fields: list | str, format: str=''):
@@ -2058,6 +2065,76 @@ class Recursive(CTE):
         return self
 
 
+MAIN_TAG = '__main__'
+
+class CTEFactory:
+    def __init__(self, txt: str):
+        """
+        Syntax:
+        ---
+        **SELECT ...
+        FROM** ( `sub_query1` ) **AS** `alias_1`
+        JOIN ( `sub_query2` ) **AS** `alias_2` **ON** `__join__`
+        """
+        summary = self.extract_subqueries(txt)
+        self.main = detect( summary.pop(MAIN_TAG) )
+        self.cte_list = [
+            CTE(alias, [
+                Select.parse(query)[0]
+                for query in elements
+            ])
+            for alias, elements in summary.items()
+        ]
+
+    def __str__(self):
+        CTE.show_query = False
+        lines = [str(cte) for cte in self.cte_list]
+        return ',\n'.join(lines) + '\n' + str(self.main)
+
+    @staticmethod
+    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 = ''
+            pos = start
+            while not alias:
+                found = re.search(r'[)]\s*AS\s+\w+', txt[pos:], re.IGNORECASE)
+                if not found:
+                    break
+                end = found.end() + pos
+                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
+            if not result:
+                result[MAIN_TAG] = txt[:start]
+            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
+
+
 # ----- Rules -----
 
 class RulePutLimit(Rule):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.6139999999999
+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
@@ -888,3 +888,49 @@ R2 = Recursive.create(
 
 >> Note: Comments added later.
 ---
+
+### CTEFactory class
+CTEFactory exchanges subqueries for CTEs, simply by passing the text of the "dirty" query:
+
+*Example*:
+```
+print(
+        CTEFactory("""
+            SELECT u001.name, agg_sales.total
+            FROM (
+                SELECT * FROM Users u
+                WHERE u.status = 'active'
+            ) AS u001
+            JOIN (
+                SELECT s.user_id, Sum(s.value) as total
+                FROM Sales s
+                GROUP BY s.user_id
+            )
+            As agg_sales
+            ON u001.id = agg_sales.user_id
+            ORDER BY u001.name
+        """)        
+)
+```
+results...
+```
+    WITH u001 AS (
+        SELECT * FROM Users u
+        WHERE u.status = 'active'
+    ),
+    WITH agg_sales AS (
+        SELECT s.user_id, Sum(s.value) as total
+        FROM Sales s
+        GROUP BY s.user_id
+    )
+    SELECT
+            u001.name,
+            agg_sales.total
+    FROM
+            u001 u001
+            JOIN agg_sales agg_sales ON
+            (u001.id = agg_sales.user_id)
+    ORDER BY
+            u001.name
+```
+---

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

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=qDwpII5rYY8tqpp93bKKHW9udOqI3SRb-0wfxjAsYD4,74694
-sql_blocks-1.25.6139999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.6139999999999.dist-info/METADATA,sha256=Pmk2nqJ3hV7PZVGE8V0bqw8TnSa1_rVIiylJad-nDCk,22236
-sql_blocks-1.25.6139999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.6139999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.6139999999999.dist-info/RECORD,,