sql-blocks 0.1.2__tar.gz → 0.1.4__tar.gz

{sql_blocks-0.1.2/sql_blocks.egg-info → sql_blocks-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.1.2
+Version: 0.1.4
 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-0.1.2 → sql_blocks-0.1.4}/pyproject.toml

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

{sql_blocks-0.1.2 → sql_blocks-0.1.4}/setup.py

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

{sql_blocks-0.1.2 → sql_blocks-0.1.4}/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,13 +74,18 @@ class SQLObject:
             if symmetrical:
                 fld = fld.lower()
             return fld.strip()
+        def is_named_field(fld: str) -> bool:
+            return key == SELECT and re.search(' as | AS ', fld)
         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, '', cleanup(fld))
+                (
+                    fld if is_named_field(fld) else
+                    re.sub(pattern, '', cleanup(fld))
+                )
                 for string in source
                 for fld in re.split(separator, string)
             )       
@@ -405,8 +410,6 @@ class Select(SQLObject):
         self.break_lines = True
 
     def update_values(self, key: str, new_values: list):
-        if key == SELECT:
-            new_values = [re.split(' as | AS ', val)[-1] for val in new_values]
         for value in self.diff(key, new_values):
             self.values.setdefault(key, []).append(value)
 
@@ -639,15 +642,3 @@ class RuleDateFuncReplace(Rule):
             temp = Select(f'{target.table_name} {target.alias}')
             Between(f'{year}-01-01', f'{year}-12-31').add(field, temp)
             target.values[WHERE][i] = ' AND '.join(temp.values[WHERE])
-
-
-if __name__ == "__main__":
-    query = Select(
-        'Cast c',
-        actor_id=Select(
-            'Actor a',
-            name=NamedField('actors_name'),
-            id=PrimaryKey
-        )
-    )
-    print(query)

{sql_blocks-0.1.2 → sql_blocks-0.1.4/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.1.2
+Version: 0.1.4
 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