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

sql_blocks/sql_blocks.py

@@ -202,9 +202,14 @@ class NamedField:
         self.class_type = class_type
 
     def add(self, name: str, main: SQLObject):
+        def is_literal() -> bool:
+            if re.search(r'^[\'"].*', name):
+                return True
+            return False
         main.values.setdefault(SELECT, []).append(
             '{} as {}'.format(
-                self.class_type.format(name, main),
+                name if is_literal() 
+                else self.class_type.format(name, main),
                 self.alias  # --- field alias
             )
         )
@@ -945,15 +950,16 @@ class OrderBy(Clause):
 
     @classmethod
     def format(cls, name: str, main: SQLObject) -> str:
-        if cls.ascending(name):
-            cls.sort = SortType.ASC
-        else:
+        # if cls.ascending(name):
+        #     cls.sort = SortType.ASC
+        # else:
+        if not cls.ascending(name):
             cls.sort = SortType.DESC
         return super().format(name, main)
 
     @classmethod
     def cls_to_str(cls, field: str='') -> str:
-        return f"{ORDER_BY} {field}"
+        return f"{ORDER_BY} {field}{cls.sort.value}"
 
 class Partition:
     @classmethod
@@ -1064,7 +1070,8 @@ class QueryLanguage:
         return  self.join_with_tabs(values, ' AND ')
 
     def sort_by(self, values: list) -> str:
-        if OrderBy.sort == SortType.DESC and OrderBy.ascending(values[-1]):
+        is_ascending = OrderBy.ascending(values[-1]) if values else False
+        if OrderBy.sort == SortType.DESC and is_ascending:
             values[-1] += ' DESC'
         return self.join_with_tabs(values, ',')
 
@@ -2190,7 +2197,8 @@ class Recursive(CTE):
 MAIN_TAG = '__main__'
 
 class CTEFactory:
-    def __init__(self, txt: str):
+    
+    def __init__(self, txt: str, template: str = ''):
         """
         SQL syntax:
         ---
@@ -2203,30 +2211,28 @@ class CTEFactory:
         Table1(field, `function$`field`:alias`, `group@`) <- Table2(field)
         `...`MainTable(field)
         """
+        if template:
+            for table in re.findall(r'[#](\w+)', txt):
+                txt = txt.replace(f'#{table}', template.format(t=table))
         if parser_class(txt) == CypherParser:
-            txt, main_script = txt.split('...')
+            txt, *main_script = txt.split('...')
             query_list = Select.parse(txt, CypherParser)
             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)
-                    ))
+                main_script = self.replace_wildcards(
+                    ''.join(main_script), query_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])]
+            related_tables = any([
+                query.join_type.value for query in query_list
+            ])
+            if related_tables:
+                query_list = [ join_queries(query_list) ]
+            self.cte_list = [CTE(alias, query_list)]
             return 
         summary = self.extract_subqueries(txt)
         self.main = detect( summary.pop(MAIN_TAG) )
@@ -2244,6 +2250,21 @@ class CTEFactory:
         result = ',\n'.join(lines) + '\n' + str(self.main)
         CTE.show_query = True
         return result    
+    
+    @staticmethod
+    def replace_wildcards(txt: str, query_list: list) -> str:
+        if '(*)' in txt:
+            field_list = [
+                re.split(
+                    r'\bas\b|\bAS\b', field
+                )[-1].strip()
+                for query in query_list
+                for field in query.values.get(SELECT, [])
+            ]
+            return txt.replace('(*)', '({}, *)'.format(
+                ','.join( set(field_list) )
+            ))
+        return txt
 
     @staticmethod
     def extract_subqueries(txt: str) -> dict:        
@@ -2280,7 +2301,7 @@ class CTEFactory:
             query_list = [
                 clean_subquery( expr.split() )
                 for expr in  re.split(
-                    r'\bUNION\b', txt[start: end], re.IGNORECASE
+                    r'\bUNION\b', txt[start: end], flags=re.IGNORECASE
                 )
             ]
             result[MAIN_TAG] += f' {alias} {alias}'
@@ -2397,8 +2418,8 @@ def parser_class(text: str) -> Parser:
     PARSER_REGEX = [
         (r'select.*from', SQLParser),
         (r'[.](find|aggregate)[(]', MongoParser),
-        (r'[(\[]\w*[:]\w+', Neo4JParser),
-        (r'^\w+[@]*\w*[(]', CypherParser)
+        (r'\bmatch\b\s*[(]', Neo4JParser),
+        (r'^\w+\S+[(]', CypherParser),
     ]
     text = Parser.remove_spaces(text)
     for regex, class_type in PARSER_REGEX:
@@ -2436,9 +2457,28 @@ def detect(text: str, join_method = join_queries, format: str='') -> Select | li
     return result
 # ===========================================================================================//
 
+
 if __name__ == "__main__":
+    OrderBy.sort = SortType.DESC
     cte = CTEFactory(
-        "Sales(year$ref_date:ref_year@, sum$quantity:qty_sold, vendor) <- Vendor(id, name:vendors_name@)"
+        # "#Customer#Employee#Supplier...People_by_Type(*)",
+        # template = '{t}("{t[0]}":ptype, nome:person_name)'
+        """
+            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
+        """        
+        # "Sales(year$ref_date:ref_year@, sum$quantity:qty_sold, vendor) <- Vendor(id, name:vendors_name@)"
         # ^^^   ^^^           ^^^
         #  |     |             |                                       ^^^            ^^^
         #  |     |             |                                        |              |
@@ -2450,6 +2490,6 @@ if __name__ == "__main__":
         #  |                                                                           |
         #  +--- The Sales table                                                        |
         #                               Also groups by vendor´s name ------------------+ 
-        "...Annual_Sales_per_Vendor(*) -> Goal(year, target)"
+        # "...Annual_Sales_per_Vendor(*) -> Goal(^year, target)"
     )
     print(cte)

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

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

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

sql_blocks-1.20250713.dist-info/RECORD

@@ -1,7 +0,0 @@
-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,,