sql-blocks 0.0.5__tar.gz → 0.0.6__tar.gz

{sql_blocks-0.0.5/sql_blocks.egg-info → sql_blocks-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.5
+Version: 0.0.6
 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
@@ -306,9 +306,9 @@ m2 = Select(
     Select(
         'Product',
         label=Case('price').when(
-            lt(50), 'cheap'
+            Where.lt(50), 'cheap'
         ).when(
-            gt(100), 'expensive'
+            Where.gt(100), 'expensive'
         ).else_value(
             'normal'
         )

{sql_blocks-0.0.5 → sql_blocks-0.0.6}/README.md

@@ -291,9 +291,9 @@ m2 = Select(
     Select(
         'Product',
         label=Case('price').when(
-            lt(50), 'cheap'
+            Where.lt(50), 'cheap'
         ).when(
-            gt(100), 'expensive'
+            Where.gt(100), 'expensive'
         ).else_value(
             'normal'
         )

{sql_blocks-0.0.5 → sql_blocks-0.0.6}/pyproject.toml

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

{sql_blocks-0.0.5 → sql_blocks-0.0.6}/setup.py

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

sql_blocks-0.0.6/sql_blocks/__init__.py

@@ -0,0 +1 @@
+from sql_blocks.sql_blocks import *

{sql_blocks-0.0.5 → sql_blocks-0.0.6}/sql_blocks/sql_blocks.py

@@ -511,32 +511,3 @@ SubSelect = SelectIN
 
 class NotSelectIN(SelectIN):
     condition_class = Not
-
-
-if __name__ == "__main__":
-    query_list = Select.parse("""
-        SELECT
-                cas.role,
-                m.title,
-                m.release_date,
-                a.name as actors_name
-        FROM
-                Actor a
-                LEFT JOIN Cast cas ON (a.cast = cas.id)
-                LEFT JOIN Movie m ON (cas.movie = m.id)
-        WHERE
-                m.genre NOT in (SELECT g.id from Genres g where g.name in ('sci-fi', 'horror', 'distopia'))
-                AND (m.hashtag = '#cult' OR m.awards LIKE '%Oscar%')
-                AND m.id IN (select DISTINCT r.movie FROM Review r GROUP BY r.movie HAVING Avg(r.rate) > 4.5)
-                AND a.age <= 69 AND a.age >= 45
-        ORDER BY
-                m.release_date
-    """)
-    for query in query_list:
-        descr = ' {} ({}) '.format(
-            query.table_name,
-            query.__class__.__name__
-        )
-        print(descr.center(50, '-'))
-        print(query)
-    print('='*50)

{sql_blocks-0.0.5 → sql_blocks-0.0.6/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.5
+Version: 0.0.6
 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
@@ -306,9 +306,9 @@ m2 = Select(
     Select(
         'Product',
         label=Case('price').when(
-            lt(50), 'cheap'
+            Where.lt(50), 'cheap'
         ).when(
-            gt(100), 'expensive'
+            Where.gt(100), 'expensive'
         ).else_value(
             'normal'
         )

{sql_blocks-0.0.5 → sql_blocks-0.0.6}/tests/tests.py

@@ -4,8 +4,8 @@ from sql_blocks.sql_blocks import *
 Select.join_type = JoinType.LEFT
 OrderBy.sort = SortType.DESC
 
-def best_movies() -> SubSelect:
-    return SubSelect(
+def best_movies() -> SelectIN:
+    return SelectIN(
         'Review r',  movie=[GroupBy, Distinct], rate=Having.avg(Where.gt(4.5))
     )
 
@@ -35,7 +35,7 @@ def query_reference() -> Select:
                 'Movie m', title=Field,
                 release_date=[OrderBy, Field],
                 id=[
-                    SubSelect(
+                    SelectIN(
                         'Review r', movie=[GroupBy, Distinct],
                         rate=Having.avg(Where.gt(4.5))
                     ),
@@ -48,8 +48,15 @@ def query_reference() -> Select:
         name=NamedField('actors_name'),
     ) # ----------- Actor
 
-def single_text_to_objects():
-    return Select.parse('''
+SINGLE_CONDITION_GENRE = "( m.genre = 'Sci-Fi' OR m.awards LIKE '%Oscar%' )"
+SUB_QUERIES_CONDITIONS = """
+    m.genre NOT in (SELECT g.id from Genres g where g.name in ('sci-fi', 'horror', 'distopia'))
+    AND (m.hashtag = '#cult' OR m.awards LIKE '%Oscar%')
+    AND m.id IN (select DISTINCT r.movie FROM Review r GROUP BY r.movie HAVING Avg(r.rate) > 4.5)
+"""
+
+def single_text_to_objects(conditions: str=SINGLE_CONDITION_GENRE):
+    return Select.parse(f'''
         SELECT
                 cas.role,
                 m.title,
@@ -60,7 +67,7 @@ def single_text_to_objects():
                 LEFT JOIN Cast cas ON (a.cast = cas.id)
                 LEFT JOIN Movie m ON (cas.movie = m.id)
         WHERE
-                ( m.genre = 'Sci-Fi' OR m.awards LIKE '%Oscar%' )
+                {conditions}
                 AND a.age <= 69 AND a.age >= 45
         ORDER BY
                 m.release_date DESC
@@ -96,4 +103,8 @@ def select_product() -> Select:
         Product=Table('name,promotional,stock_amount,expiration_date'),
         category=[Where.list([6,14,29,35,78]),Field], EAN=[Field, OrderBy],
         price=[Where.lt(357.46),Field], status=Where('= Last_st')
-    )
+    )
+
+def extract_subqueries() -> dict:
+    query_list = single_text_to_objects(SUB_QUERIES_CONDITIONS)
+    return {query.table_name: query for query in query_list}

sql_blocks-0.0.5/sql_blocks/__init__.py

@@ -1 +0,0 @@
-from sql_blocks import *