sql-blocks 1.25.610999999999__py3-none-any.whl → 1.25.6109999999999__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -84,6 +84,17 @@ class SQLObject:
         appendix = {WHERE: r'\s+and\s+|', FROM: r'\s+join\s+|\s+JOIN\s+'}
         return KEYWORD[key][0].format(appendix.get(key, ''))
 
+    @staticmethod
+    def contains_CASE_statement(text: str) -> bool:
+        return re.search(r'\bCASE\b', text, re.IGNORECASE)
+
+    @classmethod
+    def split_fields(cls, text: str, key: str) -> list:
+        if key == SELECT and cls.contains_CASE_statement(text):
+            return Case.parse(text)
+        separator = cls.get_separator(key)
+        return re.split(separator, text)
+
     @staticmethod
     def is_named_field(fld: str, name: str='') -> bool:
         return re.search(fr'(\s+as\s+|\s+AS\s+){name}', fld)
@@ -103,16 +114,13 @@ class SQLObject:
                 result += re.split(r'([=()]|<>|\s+ON\s+|\s+on\s+)', fld)
             return result
         def cleanup(text: str) -> str:
-            if re.search(r'^CASE\b', text):
+            # if re.search(r'^CASE\b', text):
+            if self.contains_CASE_statement(text):
                 return text
             text = re.sub(r'[\n\t]', ' ', text)
             if exact:
                 text = text.lower()
             return text.strip()
-        def split_fields(text: str) -> list:
-            if key == SELECT:
-                return Case.parse(text)
-            return re.split(separator, text)
         def field_set(source: list) -> set:
             return set(
                 (
@@ -122,14 +130,13 @@ class SQLObject:
                     re.sub(pattern, '', cleanup(fld))
                 )
                 for string in disassemble(source)
-                for fld in split_fields(string)
+                for fld in self.split_fields(string, key)
             )       
         pattern = KEYWORD[key][1] 
         if exact:
             if key == WHERE:
                 pattern = r'["\']| '
             pattern += f'|{PATTERN_PREFIX}'
-        separator = self.get_separator(key)
         s1 = field_set(search_list)
         s2 = field_set(self.values.get(key, []))
         if exact:
@@ -727,7 +734,7 @@ class Case:
                 result += block.fields
                 block.fields = []
             elif word not in RESERVED_WORDS:
-                result.append(word)
+                result.append(word.replace(',', ''))
             last_word = word
         return result
 
@@ -1417,13 +1424,12 @@ class SQLParser(Parser):
                 for key in USUAL_KEYS:
                     if not key in values:
                         continue
-                    separator = self.class_type.get_separator(key)
                     cls = {
                         ORDER_BY: OrderBy, GROUP_BY: GroupBy
                     }.get(key, Field)
                     obj.values[key] = [
                         cls.format(fld, obj)
-                        for fld in re.split(separator, values[key])
+                        for fld in self.class_type.split_fields(values[key], key)
                         if (fld != '*' and len(tables) == 1) or obj.match(fld, key)
                     ]
                 result[obj.alias] = obj
@@ -2111,4 +2117,3 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
     return result
 # ===========================================================================================//
 
-

{sql_blocks-1.25.610999999999.dist-info → sql_blocks-1.25.6109999999999.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=09o87wu2xc82AMMyV-OBiYmv0d_kfL_DIH6G--3-DIA,71615
+sql_blocks-1.25.6109999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.6109999999999.dist-info/METADATA,sha256=KpFEm1tvvHvoURZ3kV1VjvBvSIEGGAWuskacBXg0Xp4,22236
+sql_blocks-1.25.6109999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.6109999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.6109999999999.dist-info/RECORD,,

sql_blocks-1.25.610999999999.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=tdfGConHw2iosex_BSXAWxYTGufPyOVMSTyi3g6gqpM,71400
-sql_blocks-1.25.610999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.610999999999.dist-info/METADATA,sha256=09DIeKq_SinVNKt0OyYQQDOZ2_DDR6CmoP_n99t4ZXA,22235
-sql_blocks-1.25.610999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.610999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.610999999999.dist-info/RECORD,,