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

sql_blocks/sql_blocks.py

@@ -330,16 +330,20 @@ class DateDiff(Function):
     append_param = True
 
     def __str__(self) -> str:
-        def is_field_or_func(name: str) -> bool:
+        def is_field_or_func(obj) -> bool:
+            if not isinstance(obj, str):
+                return True
             candidate = re.sub(
-                '[()]', '', name.split('.')[-1]
+                '[()]', '', obj.split('.')[-1]
             )
             return candidate.isidentifier()
+        self.params = [
+            p if is_field_or_func(p) else f"'{p}'"
+            for p in self.params
+        ]
         if self.dialect != Dialect.SQL_SERVER:
-            params = [str(p) for p in self.params]
             return ' - '.join(
-                p if is_field_or_func(p) else f"'{p}'"
-                for p in params
+                str(p) for p in self.params
             )  # <====  Date subtract
         return super().__str__()
 
@@ -654,6 +658,8 @@ class Not(Where):
 
 
 class Case:
+    break_lines = True
+
     def __init__(self, field: str):
         self.__conditions = {}
         self.default = None
@@ -669,7 +675,10 @@ class Case:
     
     def then(self, result):
         if isinstance(result, str):
-            result = quoted(result)
+            if result.startswith('='):
+                result = result[1:]
+            else:
+                result = quoted(result)
         self.__conditions[result] = self.current_condition
         return self
     
@@ -680,16 +689,24 @@ class Case:
         return self
     
     def format(self, name: str, field: str='') -> str:
+        TABULATION = '\t\t' if self.break_lines else ' '
+        LINE_BREAK = '\n' if self.break_lines else ' '
         default = self.default
         if not field:
             field = self.field
-        return 'CASE \n{}\n\tEND AS {}'.format(
-            '\n'.join(
-                f'\t\tWHEN {field} {cond.content} THEN {res}'
+        return 'CASE{brk}{cond}{df}{tab}END{alias}'.format(
+            brk=LINE_BREAK,
+            cond=LINE_BREAK.join(
+                f'{TABULATION}WHEN {field} {cond.content} THEN {res}'
                 for res, cond in self.__conditions.items()
-            ) + (f'\n\t\tELSE {default}' if default else ''),
-            name
+            ),
+            df=f'{LINE_BREAK}{TABULATION}ELSE {default}' if not default is None else '',
+            tab='\n\t' if self.break_lines else ' ',
+            alias=f' AS {name}' if name else ''
         )
+    
+    def __str__(self):
+        return self.format('', self.field)
 
     def add(self, name: str, main: SQLObject):
         main.values.setdefault(SELECT, []).append(
@@ -2089,7 +2106,9 @@ class CTEFactory:
     def __str__(self):
         CTE.show_query = False
         lines = [str(cte) for cte in self.cte_list]
-        return ',\n'.join(lines) + '\n' + str(self.main)
+        result = ',\n'.join(lines) + '\n' + str(self.main)
+        CTE.show_query = True
+        return result    
 
     @staticmethod
     def extract_subqueries(txt: str) -> dict:        
@@ -2278,4 +2297,4 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
     for query in query_list[1:]:
         result += query
     return result
-# ===========================================================================================//
+# ===========================================================================================//

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

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=ODdGib5t0Jdk1-t9CKCEISWRWzVFJR4tCpfZt5Qw4GA,78119
+sql_blocks-1.2025.629.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.2025.629.dist-info/METADATA,sha256=tk1PPS4ojtXU5oYyqXBwwr_QjzAlIjI7rqzmJhMa4bI,23328
+sql_blocks-1.2025.629.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.2025.629.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.2025.629.dist-info/RECORD,,

sql_blocks-1.2025.627.dist-info/RECORD

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