sql-blocks 0.1.1__tar.gz → 0.1.3__tar.gz

{sql_blocks-0.1.1/sql_blocks.egg-info → sql_blocks-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.1.1
+Version: 0.1.3
 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
@@ -45,7 +45,7 @@ You can specify your own alias:  `a = Select('Actor a')`
         'Product',
         due_date=NamedField(
             'YEAR_ref',
-            ExpressionField('extract(year from %)') #  <<---
+            ExpressionField('extract(year from {f})') #  <<---
         )
     )
 ```
@@ -302,7 +302,7 @@ best_movies = SelectIN(
     rate=[GroupBy, Having.avg(Where.gt(4.5))]
 )
 m1 = Select(
-    Movie=Table('title,release_date),
+    Movie=Table('title,release_date'),
     id=best_movies
 )
 
@@ -320,9 +320,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.1.1 → sql_blocks-0.1.3}/README.md

@@ -30,7 +30,7 @@ You can specify your own alias:  `a = Select('Actor a')`
         'Product',
         due_date=NamedField(
             'YEAR_ref',
-            ExpressionField('extract(year from %)') #  <<---
+            ExpressionField('extract(year from {f})') #  <<---
         )
     )
 ```
@@ -287,7 +287,7 @@ best_movies = SelectIN(
     rate=[GroupBy, Having.avg(Where.gt(4.5))]
 )
 m1 = Select(
-    Movie=Table('title,release_date),
+    Movie=Table('title,release_date'),
     id=best_movies
 )
 
@@ -305,9 +305,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.1.1 → sql_blocks-0.1.3}/pyproject.toml

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

{sql_blocks-0.1.1 → sql_blocks-0.1.3}/setup.py

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

{sql_blocks-0.1.1 → sql_blocks-0.1.3}/sql_blocks/sql_blocks.py

@@ -5,10 +5,10 @@ import re
 PATTERN_PREFIX = '([^0-9 ]+[.])'
 PATTERN_SUFFIX = '( [A-Za-z_]+)'
 SUFFIX_AND_PRE = f'{PATTERN_SUFFIX}|{PATTERN_PREFIX}'
-DISTINCT_SF_PR = f'(DISTINCT|distinct)|{SUFFIX_AND_PRE}'
+DISTINCT_PREFX = f'(DISTINCT|distinct)|{PATTERN_PREFIX}'
 
 KEYWORD = {
-    'SELECT': (',{}', 'SELECT *', DISTINCT_SF_PR),
+    'SELECT': (',{}', 'SELECT *', DISTINCT_PREFX),
     'FROM': ('{}', '', PATTERN_SUFFIX),
     'WHERE': ('{}AND ', '', ''),
     'GROUP BY': (',{}', '', SUFFIX_AND_PRE),
@@ -74,6 +74,7 @@ class SQLObject:
             if symmetrical:
                 fld = fld.lower()
             return fld.strip()
+        # if key == SELECT and re.search(' as | AS ', fld)
         pattern = KEYWORD[key][2] 
         if key == WHERE and symmetrical:
             pattern = f'{PATTERN_PREFIX}| '
@@ -160,11 +161,20 @@ class ExpressionField:
         main.values.setdefault(SELECT, []).append(self.format(name, main))
 
     def format(self, name: str, main: SQLObject) -> str:
-        return self.expr.replace('%', Field.format(name, main))
+        """
+        Replace special chars...
+            {af}  or  {a.f} or % = alias and field
+            {a} = alias
+            {f} = field
+            {t} = table name
+        """
+        return re.sub('{af}|{a.f}|[%]', '{a}.{f}', self.expr).format(
+            a=main.alias, f=name, t=main.table_name
+        )
 
 
 class Table:
-    def __init__(self, fields: list | str=[]):
+    def __init__(self, fields: list=[]):
         if isinstance(fields, str):
             fields = [f.strip() for f in fields.split(',')]
         self.fields = fields
@@ -263,7 +273,7 @@ class Not(Where):
 
     @classmethod
     def eq(cls, value):
-        return Where.__constructor('<>', value)
+        return Where(expr=f'<> {quoted(value)}')
 
 
 class Case:
@@ -520,7 +530,7 @@ class Select(SQLObject):
             if '=' in item:
                 a1, f1, a2, f2 = [r.strip() for r in re.split('[().=]', item) if r]
                 obj1: SQLObject = result[a1]
-                obj2:SQLObject = result[a2]
+                obj2: SQLObject = result[a2]
                 PrimaryKey.add(f2, obj2)
                 ForeignKey(obj2.table_name).add(f1, obj1)
             else:

{sql_blocks-0.1.1 → sql_blocks-0.1.3/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.1.1
+Version: 0.1.3
 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
@@ -45,7 +45,7 @@ You can specify your own alias:  `a = Select('Actor a')`
         'Product',
         due_date=NamedField(
             'YEAR_ref',
-            ExpressionField('extract(year from %)') #  <<---
+            ExpressionField('extract(year from {f})') #  <<---
         )
     )
 ```
@@ -302,7 +302,7 @@ best_movies = SelectIN(
     rate=[GroupBy, Having.avg(Where.gt(4.5))]
 )
 m1 = Select(
-    Movie=Table('title,release_date),
+    Movie=Table('title,release_date'),
     id=best_movies
 )
 
@@ -320,9 +320,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'
         )