sql-blocks 0.0.1__tar.gz → 0.0.2__tar.gz

{sql_blocks-0.0.1/sql_blocks.egg-info → sql_blocks-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.1
+Version: 0.0.2
 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
@@ -35,7 +35,7 @@ You can specify your own alias:  `a = Select('Actor a')`
 
     - Select(
         'Actor a', 
-        name=NamedField('actors_name'), Distinct
+        name=NamedField('actors_name', Distinct)
     )
 
 ---

{sql_blocks-0.0.1 → sql_blocks-0.0.2}/README.md

@@ -20,7 +20,7 @@ You can specify your own alias:  `a = Select('Actor a')`
 
     - Select(
         'Actor a', 
-        name=NamedField('actors_name'), Distinct
+        name=NamedField('actors_name', Distinct)
     )
 
 ---

{sql_blocks-0.0.1 → sql_blocks-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sql_blocks"
-version = "0.0.1"
+version = "0.0.2"
 authors = [
   { name="Julio Cascalles", email="julio.cascalles@outlook.com" },
 ]

{sql_blocks-0.0.1 → sql_blocks-0.0.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name = 'sql_blocks',
-    version = '1.0.0',
+    version = '0.0.2',
     author = 'Júlio Cascalles',
     author_email = 'julio.cascalles@outlook.com',
     packages = ['sql_blocks'],

{sql_blocks-0.0.1 → sql_blocks-0.0.2}/sql_blocks/sql_blocks.py

@@ -11,6 +11,7 @@ KEYWORD = {
 SELECT, FROM, WHERE, GROUP_BY, ORDER_BY, LIMIT = KEYWORD.keys()
 USUAL_KEYS = [SELECT, WHERE, GROUP_BY, ORDER_BY]
 
+
 class SQLObject:
     def __init__(self, table_name: str=''):
         self.alias = ''
@@ -133,15 +134,21 @@ class ForeignKey:
         return cls.references.get(key, '').split('_')
 
 
+def quoted(value) -> str:
+    if isinstance(value, str):
+        value = f"'{value}'"
+    return str(value)
+
+
 class Where:
+    prefix = ''
+
     def __init__(self, expr: str):
-        self.expr = expr
+        self.expr = f'{self.prefix}{expr}'
 
     @classmethod
     def __constructor(cls, operator: str, value):
-        if isinstance(value, str):
-            return cls(expr=f"{operator} '{value}'")
-        return cls(expr=f'{operator} {value}')
+        return cls(expr=f'{operator} {quoted(value)}')
 
     @classmethod
     def eq(cls, value):
@@ -164,8 +171,18 @@ class Where:
         return cls.__constructor('<', value)
 
     @classmethod
-    def lte(cls, value) -> str:
+    def lte(cls, value):
         return cls.__constructor('<=', value)
+    
+    @classmethod
+    def is_null(cls):
+        return cls('IS NULL')
+    
+    @classmethod
+    def list(cls, values):
+        if isinstance(values, list):
+            values = ','.join(quoted(v) for v in values)
+        return cls(f'IN ({values})')
 
     def add(self, name: str, main: SQLObject):
         main.values.setdefault(WHERE, []).append('{} {}'.format(
@@ -173,6 +190,41 @@ class Where:
         ))
 
 
+class Not(Where):
+    prefix = 'NOT '
+
+    @classmethod
+    def eq(cls, value):
+        return Where.__constructor('<>', value)
+
+
+class Case:
+    def __init__(self, field: str):
+        self.__conditions = {}
+        self.default = None
+        self.field = field
+
+    def when(self, condition: Where, result: str):
+        self.__conditions[result] = condition
+        return self
+    
+    def else_value(self, default: str):
+        self.default = default
+        return self
+    
+    def add(self, name: str, main: SQLObject):
+        field = Field.format(self.field, main)
+        default = quoted(self.default)
+        name = 'CASE \n{}\n\tEND AS {}'.format(
+            '\n'.join(
+                f'\t\tWHEN {field} {cond.expr} THEN {quoted(res)}'
+                for res, cond in self.__conditions.items()
+            ) + f'\n\t\tELSE {default}' if default else '',
+            name
+        )
+        main.values.setdefault(SELECT, []).append(name)
+
+
 class Options:
     def __init__(self, **values):
         self.__children: dict = values
@@ -266,10 +318,7 @@ class Select(SQLObject):
 
     def __init__(self, table_name: str='', **values):
         super().__init__(table_name)
-        to_list = lambda x: x if isinstance(x, list) else [x]
-        for name, params in values.items():
-            for obj in to_list(params):
-                obj.add(name, self)
+        self.__call__(**values)
         self.break_lines = True
 
     def add(self, name: str, main: SQLObject):
@@ -319,10 +368,12 @@ class Select(SQLObject):
         return f'{select}{_from}{where}{groupBy}{orderBy}{limit}'.strip()
    
     def __call__(self, **values):
-        for name, obj in values.items():
-            obj.add(name, self)
+        to_list = lambda x: x if isinstance(x, list) else [x]
+        for name, params in values.items():
+            for obj in to_list(params):
+                obj.add(name, self)
         return self
-    
+
     def __eq__(self, other: SQLObject) -> bool:
         def sorted_values(obj: SQLObject, key: str) -> list:
             return sorted(obj.values.get(key, []))
@@ -380,4 +431,4 @@ class Select(SQLObject):
 class SubSelect(Select):
     def add(self, name: str, main: SQLObject):
         self.break_lines = False
-        Where(f'IN ({self})').add(name, main)
+        Where.list(self).add(name, main)

{sql_blocks-0.0.1 → sql_blocks-0.0.2/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.1
+Version: 0.0.2
 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
@@ -35,7 +35,7 @@ You can specify your own alias:  `a = Select('Actor a')`
 
     - Select(
         'Actor a', 
-        name=NamedField('actors_name'), Distinct
+        name=NamedField('actors_name', Distinct)
     )
 
 ---

{sql_blocks-0.0.1 → sql_blocks-0.0.2}/tests/tests.py

@@ -1,6 +1,9 @@
-from sql_blocks import *
+from sql_blocks.sql_blocks import *
 
 
+Select.join_type = JoinType.LEFT
+OrderBy.sort = SortType.DESC
+
 def best_movies() -> SubSelect:
     return SubSelect(
         'Review r',  movie=[GroupBy, Distinct], rate=Having.avg(Where.gt(4.5))
@@ -24,7 +27,7 @@ def detached_objects() -> tuple:
         )
     return select_actor(), select_cast(), select_movie()
 
-def expected_result() -> Select:
+def query_reference() -> Select:
     return Select('Actor a', age=Between(45, 69),
         cast=Select(
             Cast=Table('role'), id=PrimaryKey,
@@ -78,13 +81,3 @@ def many_texts_to_objects():
         WHERE ( m.genre = 'Sci-Fi' OR m.awards LIKE '%Oscar%' ) GROUP BY director
     """)[0]
     return actor, cast, movie
-
-Select.join_type = JoinType.LEFT
-OrderBy.sort = SortType.DESC
-b = best_movies()
-for func in [single_text_to_objects, detached_objects, many_texts_to_objects]:
-    a, c, m = func()
-    m.delete('director')
-    m = m(id=b)
-    query = a + (m + c)
-    assert query == expected_result()