sql-blocks 0.2.0__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
 
@@ -247,7 +248,7 @@ class Where:
         return cls.__constructor('=', value)
 
     @classmethod
-    def like(cls, value: str):
+    def contains(cls, value: str):
         return cls(f"LIKE '%{value}%'")
    
     @classmethod
@@ -271,7 +272,7 @@ class Where:
         return cls('IS NULL')
     
     @classmethod
-    def contains(cls, values):
+    def inside(cls, values):
         if isinstance(values, list):
             values = ','.join(quoted(v) for v in values)
         return cls(f'IN ({values})')
@@ -282,9 +283,9 @@ class Where:
         ))
 
 
-eq, like, gt, gte, lt, lte, is_null, contains = (
+eq, contains, gt, gte, lt, lte, is_null, inside = (
     getattr(Where, method) for method in 
-    ('eq', 'like', 'gt', 'gte', 'lt', 'lte', 'is_null', 'contains')
+    ('eq', 'contains', 'gt', 'gte', 'lt', 'lte', 'is_null', 'inside')
 ) 
 
 
@@ -447,23 +448,25 @@ class Select(SQLObject):
             main.update_values(key, self.values.get(key, []))
 
     def __add__(self, other: SQLObject):
-        if self.table_name.lower() == other.table_name.lower():
+        from copy import deepcopy
+        query = deepcopy(self)
+        if query.table_name.lower() == other.table_name.lower():
             for key in USUAL_KEYS:
-                self.update_values(key, other.values.get(key, []))
-            return self
-        foreign_field, primary_key = ForeignKey.find(self, other)
+                query.update_values(key, other.values.get(key, []))
+            return query
+        foreign_field, primary_key = ForeignKey.find(query, other)
         if not foreign_field:
-            foreign_field, primary_key = ForeignKey.find(other, self)
+            foreign_field, primary_key = ForeignKey.find(other, query)
             if foreign_field:
                 if primary_key:
-                    PrimaryKey.add(primary_key, self)
-                self.add(foreign_field, other)
+                    PrimaryKey.add(primary_key, query)
+                query.add(foreign_field, other)
                 return other
-            raise ValueError(f'No relationship found between {self.table_name} and {other.table_name}.')
+            raise ValueError(f'No relationship found between {query.table_name} and {other.table_name}.')
         elif primary_key:
             PrimaryKey.add(primary_key, other)
-        other.add(foreign_field, self)
-        return self
+        other.add(foreign_field, query)
+        return query
 
     def __str__(self) -> str:
         TABULATION = '\n\t' if self.break_lines else ' '
@@ -590,7 +593,7 @@ class SelectIN(Select):
 
     def add(self, name: str, main: SQLObject):
         self.break_lines = False
-        self.condition_class.contains(self).add(name, main)
+        self.condition_class.inside(self).add(name, main)
 
 SubSelect = SelectIN
 
@@ -644,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.0.dist-info → sql_blocks-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.2.0
+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
@@ -24,7 +24,7 @@ _Note that an alias "act" has been added._
 You can specify your own alias:  `a = Select('Actor a')`
 
 ---
-### 2 - You can also add a field, like this...
+### 2 - You can also add a field, contains this...
 
 * a = Select('Actor a', **name=Field**)
 
@@ -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(
@@ -93,7 +95,7 @@ query = Select('Movie m', title=Field,
 ```
     OR=Options(
         genre=eq("Sci-Fi"),
-        awards=like("Oscar")
+        awards=contains("Oscar")
     )
 ```
 > Could be AND=Options(...)
@@ -105,7 +107,7 @@ based_on_book=Not.is_null()
 
 3.5 -- List of values
 ```
-hash_tag=contains(['space', 'monster', 'gore'])
+hash_tag=inside(['space', 'monster', 'gore'])
 ```
 
 ---
@@ -113,7 +115,7 @@ hash_tag=contains(['space', 'monster', 'gore'])
 
 * m = Select('Movie m' release_date=[Field, OrderBy])
     - This means that the field will appear in the results and also that the query will be ordered by that field.
-* Applying **GROUP BY** to item 3.2, it would look like this:
+* Applying **GROUP BY** to item 3.2, it would look contains this:
     ```    
     SelectIN(
         'Review r', movie=[GroupBy, Distinct],

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.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=Fg7yPeASygx7c7Nct5yKurxRrnjVGsvp4RnR93Wwems,21519
-sql_blocks-0.2.0.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-0.2.0.dist-info/METADATA,sha256=CU4oSLqoycnvhkPROx_SSbj9zJjCwwz4JoePIgk4wSE,8794
-sql_blocks-0.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-0.2.0.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-0.2.0.dist-info/RECORD,,