sql-blocks 0.0.7__tar.gz → 0.0.9__tar.gz

{sql_blocks-0.0.7/sql_blocks.egg-info → sql_blocks-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.7
+Version: 0.0.9
 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
@@ -38,6 +38,20 @@ You can specify your own alias:  `a = Select('Actor a')`
         name=NamedField('actors_name', Distinct)
     )
 
+
+    2.1 -- Using expression as a field:
+```
+    Select(
+        'Product',
+        due_date=NamedField(
+            'YEAR_ref',
+            ExpressionField('extract(year from %)') #  <<---
+        )
+    )
+```
+...should return: 
+**SELECT extract(year from due_date) as YEAR_ref...**
+
 ---
 
 ### 3 - To set conditions, use **Where**:

{sql_blocks-0.0.7 → sql_blocks-0.0.9}/README.md

@@ -23,6 +23,20 @@ You can specify your own alias:  `a = Select('Actor a')`
         name=NamedField('actors_name', Distinct)
     )
 
+
+    2.1 -- Using expression as a field:
+```
+    Select(
+        'Product',
+        due_date=NamedField(
+            'YEAR_ref',
+            ExpressionField('extract(year from %)') #  <<---
+        )
+    )
+```
+...should return: 
+**SELECT extract(year from due_date) as YEAR_ref...**
+
 ---
 
 ### 3 - To set conditions, use **Where**:

{sql_blocks-0.0.7 → sql_blocks-0.0.9}/pyproject.toml

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

{sql_blocks-0.0.7 → sql_blocks-0.0.9}/setup.py

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

{sql_blocks-0.0.7 → sql_blocks-0.0.9}/sql_blocks/sql_blocks.py

@@ -10,7 +10,7 @@ DISTINCT_SF_PR = f'(DISTINCT|distinct)|{SUFFIX_AND_PRE}'
 KEYWORD = {
     'SELECT': (',{}', 'SELECT *', DISTINCT_SF_PR),
     'FROM': ('{}', '', PATTERN_SUFFIX),
-    'WHERE': ('{}AND ', '', f'{PATTERN_PREFIX}| '),
+    'WHERE': ('{}AND ', '', ''),
     'GROUP BY': (',{}', '', SUFFIX_AND_PRE),
     'ORDER BY': (',{}', '', SUFFIX_AND_PRE),
     'LIMIT': (' ', '', ''),
@@ -70,11 +70,17 @@ class SQLObject:
         return KEYWORD[key][0].format(appendix.get(key, ''))
 
     def diff(self, key: str, search_list: list, symmetrical: bool=False) -> set:
-        pattern = KEYWORD[key][2]
+        def cleanup(fld: str) -> str:
+            if symmetrical:
+                fld = fld.lower()
+            return fld.strip()
+        pattern = KEYWORD[key][2] 
+        if key == WHERE and symmetrical:
+            pattern = f'{PATTERN_PREFIX}| '
         separator = self.get_separator(key)
         def field_set(source: list) -> set:
             return set(
-                re.sub(pattern, '', fld.strip()).lower()
+                re.sub(pattern, '', cleanup(fld))
                 for string in source
                 for fld in re.split(separator, string)
             )       
@@ -135,19 +141,28 @@ class Distinct(Field):
 class NamedField:
     def __init__(self, alias: str, class_type = Field):
         self.alias = alias
-        if class_type not in [Field] + Field.__subclasses__():
-            raise TypeError('class_type must be a Field (sub)class.')
         self.class_type = class_type
 
     def add(self, name: str, main: SQLObject):
         main.values.setdefault(SELECT, []).append(
             '{} as {}'.format(
                 self.class_type.format(name, main),
-                self.alias
+                self.alias  # --- field alias
             )
         )
 
 
+class ExpressionField:
+    def __init__(self, expr: str):
+        self.expr = expr
+
+    def add(self, name: str, main: SQLObject):
+        main.values.setdefault(SELECT, []).append(self.format)
+
+    def format(self, name: str, main: SQLObject) -> str:
+        return self.expr.replace('%', Field.format(name, main))
+
+
 class Table:
     def __init__(self, fields: list | str=[]):
         if isinstance(fields, str):
@@ -385,16 +400,17 @@ class Select(SQLObject):
             self.values.setdefault(key, []).append(value)
 
     def add(self, name: str, main: SQLObject):
-        main.update_values(
-            FROM, [
-                '{jt}JOIN {tb} {a2} ON ({a1}.{f1} = {a2}.{f2})'.format(
-                    jt=self.join_type.value,
-                    tb=self.table_name,
-                    a1=main.alias, f1=name,
-                    a2=self.alias, f2=self.key_field
-                )
-            ] + self.values[FROM][1:]
-        )
+        new_tables = [
+            '{jt}JOIN {tb} {a2} ON ({a1}.{f1} = {a2}.{f2})'.format(
+                jt=self.join_type.value,
+                tb=self.table_name,
+                a1=main.alias, f1=name,
+                a2=self.alias, f2=self.key_field
+            )
+        ]
+        if new_tables not in main.values.get(FROM, []):
+            new_tables += self.values[FROM][1:]
+            main.values.setdefault(FROM, []).extend(new_tables)
         for key in USUAL_KEYS:
             main.update_values(key, self.values.get(key, []))
 

{sql_blocks-0.0.7 → sql_blocks-0.0.9/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.7
+Version: 0.0.9
 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
@@ -38,6 +38,20 @@ You can specify your own alias:  `a = Select('Actor a')`
         name=NamedField('actors_name', Distinct)
     )
 
+
+    2.1 -- Using expression as a field:
+```
+    Select(
+        'Product',
+        due_date=NamedField(
+            'YEAR_ref',
+            ExpressionField('extract(year from %)') #  <<---
+        )
+    )
+```
+...should return: 
+**SELECT extract(year from due_date) as YEAR_ref...**
+
 ---
 
 ### 3 - To set conditions, use **Where**: