sql-blocks 1.25.312022057__py3-none-any.whl → 1.25.414021502__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -633,20 +633,24 @@ class Case:
         self.default = None
         self.field = field
 
-    def when(self, condition: Where, result: str):
+    def when(self, condition: Where, result):
+        if isinstance(result, str):
+            result = quoted(result)
         self.__conditions[result] = condition
         return self
     
-    def else_value(self, default: str):
+    def else_value(self, default):
+        if isinstance(default, str):
+            default = quoted(default)
         self.default = default
         return self
     
     def add(self, name: str, main: SQLObject):
         field = Field.format(self.field, main)
-        default = quoted(self.default)
+        default = self.default
         name = 'CASE \n{}\n\tEND AS {}'.format(
             '\n'.join(
-                f'\t\tWHEN {field} {cond.expr} THEN {quoted(res)}'
+                f'\t\tWHEN {field} {cond.content} THEN {res}'
                 for res, cond in self.__conditions.items()
             ) + f'\n\t\tELSE {default}' if default else '',
             name
@@ -1528,7 +1532,7 @@ class Select(SQLObject):
         Recognizes if the field is from the current table
         '''
         if key in (ORDER_BY, GROUP_BY) and '.' not in field:
-            return main.has_named_field(field)
+            return self.has_named_field(field)
         return re.findall(f'\b*{self.alias}[.]', field) != []
 
     @classmethod
@@ -1793,30 +1797,3 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
         result += query
     return result
 # ===========================================================================================//
-
-if __name__ == "__main__":
-    print('='*50)
-    visitante = Select(
-        'Pessoa p1',
-        nome=NamedField('nome_visitante'),
-        tipo=eq('V'), cpf=PrimaryKey
-    )
-    dono_do_apto = Select(
-        'Apartamento A',
-        dono=Select(
-            'Pessoa p2',
-            cpf=PrimaryKey,
-            nome=NamedField('nome_morador')
-        ), 
-        id=PrimaryKey
-    )
-    movimento = Select(
-        'Movimento M',
-        entrada_saida=eq('E'),
-        apartamento=dono_do_apto,
-        pessoa=visitante
-    )
-    print(dono_do_apto)
-    print('-'*50)
-    print(movimento)
-    print('='*50)

{sql_blocks-1.25.312022057.dist-info → sql_blocks-1.25.414021502.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=HUDdXrSDuippY7buAAMuFyYS9mRetAu7woy_6yBUQ7c,60161
+sql_blocks-1.25.414021502.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.414021502.dist-info/METADATA,sha256=3GGtGw0pl-9zIqwCZM2AH0GHykI1Sawkb0fpfpsLMlc,20512
+sql_blocks-1.25.414021502.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.414021502.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.414021502.dist-info/RECORD,,

sql_blocks-1.25.312022057.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=ICqvEtrB1xnCqquTyTgDX-O9hkeeysQLcLz9pdkFBYs,60671
-sql_blocks-1.25.312022057.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.312022057.dist-info/METADATA,sha256=VCXJmWhUPrpSd5dD_Jj5JeXnr2D5XLQNnXMYkWRsN0g,20512
-sql_blocks-1.25.312022057.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.312022057.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.312022057.dist-info/RECORD,,