sql-blocks 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -4,15 +4,14 @@ import re
 
 PATTERN_PREFIX = '([^0-9 ]+[.])'
 PATTERN_SUFFIX = '( [A-Za-z_]+)'
-SUFFIX_AND_PRE = f'{PATTERN_SUFFIX}|{PATTERN_PREFIX}'
-DISTINCT_PREFX = f'(DISTINCT|distinct)|{PATTERN_PREFIX}'
+DISTINCT_PREFX = '(DISTINCT|distinct)'
 
 KEYWORD = {
     'SELECT': (',{}', 'SELECT *', DISTINCT_PREFX),
     'FROM': ('{}', '', PATTERN_SUFFIX),
     'WHERE': ('{}AND ', '', ''),
-    'GROUP BY': (',{}', '', SUFFIX_AND_PRE),
-    'ORDER BY': (',{}', '', SUFFIX_AND_PRE),
+    'GROUP BY': (',{}', '', PATTERN_SUFFIX),
+    'ORDER BY': (',{}', '', PATTERN_SUFFIX),
     'LIMIT': (' ', '', ''),
 }
 #              ^    ^        ^
@@ -69,16 +68,18 @@ class SQLObject:
         appendix = {WHERE: 'and|', FROM: 'join|JOIN'}
         return KEYWORD[key][0].format(appendix.get(key, ''))
 
-    def diff(self, key: str, search_list: list, symmetrical: bool=False) -> set:
+    def diff(self, key: str, search_list: list, exact: bool=False) -> set:
         def cleanup(fld: str) -> str:
-            if symmetrical:
+            if exact:
                 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}| '
+        if exact:
+            if key == WHERE:
+                pattern = ' '
+            pattern += f'|{PATTERN_PREFIX}'
         separator = self.get_separator(key)
         def field_set(source: list) -> set:
             return set(
@@ -91,7 +92,7 @@ class SQLObject:
             )       
         s1 = field_set(search_list)
         s2 = field_set(self.values.get(key, []))
-        if symmetrical:
+        if exact:
             return s1.symmetric_difference(s2)
         return s1 - s2
 
@@ -646,7 +647,7 @@ class RuleLogicalOp(Rule):
         ))
         for i, condition in enumerate(target.values.get(WHERE, [])):
             expr = re.sub('\n|\t', ' ', condition)
-            if not re.search(r'\b(NOT|not)\b', expr):
+            if not re.search(r'\b(NOT|not).*[<>=]', expr):
                 continue
             tokens = [t.strip() for t in re.split(r'NOT\b|not\b|(<|>|=)', expr) if t]
             op = ''.join(tokens[1: len(tokens)-1])

{sql_blocks-0.2.1.dist-info → sql_blocks-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.2.1
+Version: 0.2.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
@@ -62,11 +62,13 @@ You can specify your own alias:  `a = Select('Actor a')`
     * field=gt(value) - ...the field is GREATER than the value;
     * field=lt(value) - ...the field is LESS than the value;
 
-    3.1 -- If you want to filter the field on a range of values:
-    
-    `a = Select( 'Actor a', age=Between(45, 69) )`
+> You may use Where.**eq**, Where.**gt**, Where.**lt** ... or simply **eq**, **gt**, **lt** ... 😉
+
+3.1 -- If you want to filter the field on a range of values:
+
+`a = Select( 'Actor a', age=Between(45, 69) )`
 
-    3.2 -- Sub-queries:
+3.2 -- Sub-queries:
 ```
 query = Select('Movie m', title=Field,
     id=SelectIN(

sql_blocks-0.2.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=uzMAPjx1d7CAb5WLoel_RcC91Onx3cFVQzGaww-VYEc,21552
+sql_blocks-0.2.2.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-0.2.2.dist-info/METADATA,sha256=izh5P3AG_LTwdBJyqpPwntbFXVlolK2kmhVKPmr_6dk,8892
+sql_blocks-0.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-0.2.2.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-0.2.2.dist-info/RECORD,,

sql_blocks-0.2.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=5WBEFqik86gcV4WwPHx4R2e2vMeA1D_et1C9oEMnoQw,21600
-sql_blocks-0.2.1.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-0.2.1.dist-info/METADATA,sha256=g5YLLFr736iWjO8dD0pO7nph5xEbyG6fynoAKo9-XtI,8804
-sql_blocks-0.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-0.2.1.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-0.2.1.dist-info/RECORD,,