sql-blocks 1.25.30011644__py3-none-any.whl → 1.25.30012339__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -1457,33 +1457,34 @@ class NotSelectIN(SelectIN):
     condition_class = Not
 
 
-class CTE:
+class CTE(Select):
     prefix = ''
 
-    def __init__(self, name: str, query_list: list[Select]):
-        self.name = name
+    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
 
-    def format(self, query: Select) -> str:
-        LINE_MAX_SIZE = 50
-        result, line = [], ''
-        for word in str(query).split(' '):
-            if len(line) >= LINE_MAX_SIZE and word in KEYWORD:
-                result.append(line)
-                line = ''
-            line += word + ' '
-        if line:
-            result.append(line)
-        return '\n\t'.join(result)
-
     def __str__(self) -> str:
-        return 'WITH {prefix}{name} AS (\n\t{queries}\n)SELECT * FROM {name}'.format(
-            prefix=self.prefix, name=self.name, 
-            queries='\nUNION ALL\n\t'.join(
-                self.format(q) for q in self.query_list
-            )
+        # ---------------------------------------------------------
+        def justify(query: Select) -> str:
+            LINE_MAX_SIZE = 50
+            result, line = [], ''
+            for word in str(query).split(' '):
+                if len(line) >= LINE_MAX_SIZE and word in KEYWORD:
+                    result.append(line)
+                    line = ''
+                line += word + ' '
+            if line:
+                result.append(line)
+            return '\n\t'.join(result)
+        # ---------------------------------------------------------
+        return 'WITH {}{} AS (\n\t{}\n){}'.format(
+            self.prefix, self.table_name, 
+            '\nUNION ALL\n\t'.join(
+                justify(q) for q in self.query_list
+            ), super().__str__()
         )
 
 class Recursive(CTE):
@@ -1491,8 +1492,8 @@ class Recursive(CTE):
 
     def __str__(self) -> str:
         if len(self.query_list) > 1:
-            alias = self.name[0].lower()
-            self.query_list[-1].values[FROM].append(f', {self.name} {alias}')
+            self.query_list[-1].values[FROM].append(
+                f', {self.table_name} {self.alias}')
         return super().__str__()
 
 
@@ -1623,7 +1624,7 @@ def detect(text: str, join_queries: bool = True) -> Select | list[Select]:
                 continue
             pos = [ f.span() for f in re.finditer(fr'({table})[(]', text) ]
             for begin, end in pos[::-1]:
-                new_name = f'{table}_{count}'  # See set_table (line 45)
+                new_name = f'{table}_{count}'  # See set_table (line 55)
                 Select.EQUIVALENT_NAMES[new_name] = table
                 text = text[:begin] + new_name + '(' + text[end:]
                 count -= 1

{sql_blocks-1.25.30011644.dist-info → sql_blocks-1.25.30012339.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.30011644
+Version: 1.25.30012339
 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
@@ -98,10 +98,7 @@ query = Select('Movie m', title=Field,
         awards=contains("Oscar")
     )
     AND=Options(
-        ..., name=contains(
-            'Chris',
-            Position.StartsWith
-        )
+        ..., name=startswith('Chris')
     )
 ```
 
@@ -175,8 +172,8 @@ FROM
             artist.name as artist_name,
             album.year_recorded
     FROM
-            'sql_blocks/music/data/Album.csv' album
-            ,'sql_blocks/music/data/Singer.csv' artist
+            Album album
+            ,Singer artist
     WHERE
             (album.artist_id = artist.id)
 
@@ -412,7 +409,7 @@ m2 = Select(
     query = Select(
         'Installments i', due_date=Field,  customer=Select(
             'Customer c', id=PrimaryKey,
-            name=contains('Smith', Position.EndsWith)
+            name=endswith('Smith')
         )
     )
     print(query)

sql_blocks-1.25.30012339.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=TSrqjpP41uyocxLpTePI2JzSJorxbFB_jjLfWkHmnJ0,54584
+sql_blocks-1.25.30012339.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.30012339.dist-info/METADATA,sha256=0nqWca0uwfqNns6xVIJAB_uR1KMjPnUUgrJHvBPX7bg,16753
+sql_blocks-1.25.30012339.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.30012339.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.30012339.dist-info/RECORD,,

sql_blocks-1.25.30011644.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=2R4VoSZUHTb1gSZwKjtNfkjxeH8G1dKYuDpuKv-UP7E,54430
-sql_blocks-1.25.30011644.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.30011644.dist-info/METADATA,sha256=2Q1naQygxXqw87DTc70LyLjs8uWK95v0CWu5B9qHLlQ,16884
-sql_blocks-1.25.30011644.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.30011644.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.30011644.dist-info/RECORD,,