sql-blocks 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

sql_blocks/__init__.py

@@ -1 +1 @@
-from sql_blocks import *
+from sql_blocks.sql_blocks import *

sql_blocks/sql_blocks.py

@@ -2,14 +2,27 @@ from enum import Enum
 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}'
+
 KEYWORD = {
-    'SELECT': (',{}', 'SELECT *'),
-    'FROM': ('{}', ''),
-    'WHERE': ('{}AND ', ''),
-    'GROUP BY': (',{}', ''),
-    'ORDER BY': (',{}', ''),
-    'LIMIT': (' ', ''),
+    'SELECT': (',{}', 'SELECT *', DISTINCT_SF_PR),
+    'FROM': ('{}', '', PATTERN_SUFFIX),
+    'WHERE': ('{}AND ', '', PATTERN_PREFIX),
+    'GROUP BY': (',{}', '', SUFFIX_AND_PRE),
+    'ORDER BY': (',{}', '', SUFFIX_AND_PRE),
+    'LIMIT': (' ', '', ''),
 }
+#             ^     ^        ^
+#             |     |        |
+#             |     |        +----- pattern to compare fields
+#             |     |
+#             |     +----- default when empty (SELECT * ...)
+#             |
+#             +-------- separator
+
 SELECT, FROM, WHERE, GROUP_BY, ORDER_BY, LIMIT = KEYWORD.keys()
 USUAL_KEYS = [SELECT, WHERE, GROUP_BY, ORDER_BY]
 
@@ -39,6 +52,26 @@ class SQLObject:
     def table_name(self) -> str:
         return self.values[FROM][0].split()[0]
  
+    @staticmethod
+    def get_separator(key: str) -> str:
+        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:
+        pattern = KEYWORD[key][2]
+        separator = self.get_separator(key)
+        def field_set(source: list) -> set:
+            return set(
+                re.sub(pattern, '', fld.strip()).lower()
+                for string in source
+                for fld in re.split(separator, string)
+            )       
+        s1 = field_set(search_list)
+        s2 = field_set(self.values.get(key, []))
+        if symmetrical:
+            return s1.symmetric_difference(s2)
+        return s1 - s2
+
     def delete(self, search: str, keys: list=USUAL_KEYS):
         for key in keys:
             result = []
@@ -329,13 +362,12 @@ class Select(SQLObject):
         self.__call__(**values)
         self.break_lines = True
 
+    def update_values(self, key: str, new_values: list):
+        for value in self.diff(key, new_values):
+            self.values.setdefault(key, []).append(value)
+
     def add(self, name: str, main: SQLObject):
-        def update_values(key: str, new_values: list):
-            for value in new_values:
-                old_values = main.values.get(key, [])
-                if value not in old_values:
-                    main.values[key] = old_values + [value]
-        update_values(
+        main.update_values(
             FROM, [
                 '{jt}JOIN {tb} {a2} ON ({a1}.{f1} = {a2}.{f2})'.format(
                     jt=self.join_type.value,
@@ -346,9 +378,13 @@ class Select(SQLObject):
             ] + self.values[FROM][1:]
         )
         for key in USUAL_KEYS:
-            update_values(key, self.values.get(key, []))
+            main.update_values(key, self.values.get(key, []))
 
     def __add__(self, other: SQLObject):
+        if self.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)
         if not foreign_field:
             foreign_field, primary_key = ForeignKey.find(other, self)
@@ -383,10 +419,8 @@ class Select(SQLObject):
         return self
 
     def __eq__(self, other: SQLObject) -> bool:
-        def sorted_values(obj: SQLObject, key: str) -> list:
-            return sorted(obj.values.get(key, []))
         for key in KEYWORD:
-            if sorted_values(self, key) != sorted_values(other, key):
+            if self.diff(key, other.values.get(key, []), True):
                 return False
         return True
 
@@ -427,7 +461,7 @@ class Select(SQLObject):
             inner = txt[start: end]
             if inner.count('(') > inner.count(')'):
                 end = find_parenthesis(end)
-                inner = txt[start: end]
+                inner = txt[start: end-1]
             fld, *inner = re.split(r' IN | in', inner, maxsplit=1)
             if fld.upper() == 'NOT':
                 pos = find_last_word(start)
@@ -457,15 +491,12 @@ class Select(SQLObject):
                 for key in USUAL_KEYS:
                     if not key in values:
                         continue
-                    separator = KEYWORD[key][0].format('')
-                    fields = [
+                    separator = cls.get_separator(key)
+                    obj.values[key] = [
                         Field.format(fld, obj)
-                        for fld in re.split(
-                            separator, values[key]
-                        ) if len(tables) == 1
-                        or re.findall(f'\b*{obj.alias}[.]', fld)
+                        for fld in re.split(separator, values[key])
+                        if len(tables) == 1 or re.findall(f'\b*{obj.alias}[.]', fld)
                     ]
-                    obj.values[key] = [ f for f in fields if f.strip() ]
                 result[obj.alias] = obj
         return list( result.values() )
 
@@ -480,32 +511,3 @@ SubSelect = SelectIN
 
 class NotSelectIN(SelectIN):
     condition_class = Not
-
-
-if __name__ == "__main__":
-    query_list = Select.parse("""
-        SELECT
-                cas.role,
-                m.title,
-                m.release_date,
-                a.name as actors_name
-        FROM
-                Actor a
-                LEFT JOIN Cast cas ON (a.cast = cas.id)
-                LEFT JOIN Movie m ON (cas.movie = m.id)
-        WHERE
-                m.genre NOT in (SELECT g.id from Genres g where g.name in ('sci-fi', 'horror', 'distopia'))
-                AND (m.hashtag = '#cult' OR m.awards LIKE '%Oscar%')
-                AND m.id IN (select DISTINCT r.movie FROM Review r GROUP BY r.movie HAVING Avg(r.rate) > 4.5)
-                AND a.age <= 69 AND a.age >= 45
-        ORDER BY
-                m.release_date
-    """)
-    for query in query_list:
-        descr = ' {} ({}) '.format(
-            query.table_name,
-            query.__class__.__name__
-        )
-        print(descr.center(50, '-'))
-        print(query)
-    print('='*50)

{sql_blocks-0.0.4.dist-info → sql_blocks-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.4
+Version: 0.0.6
 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
@@ -249,13 +249,13 @@ m = Select...
 9.1
 ```
         a1 = Select.parse('''
-                SELECT gender, max(age) FROM Actor act
+                SELECT gender, Max(act.age) FROM Actor act
                 WHERE act.age <= 69 AND act.age >= 45
                 GROUP BY gender
             ''')[0]
 
         a2 = Select('Actor',
-            age=Between(45, 69), gender=GroupBy,
+            age=[ Between(45, 69), Max ],
             gender=[GroupBy, Field]
         )       
 ```
@@ -306,9 +306,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.0.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=Fs636uSwXTxlzHH9SCOxmGTgt2MjhQ6Pf6v92CRtQ9E,16229
+sql_blocks-0.0.6.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-0.0.6.dist-info/METADATA,sha256=-2-vPw1nkpqKvlp0l2Bt8VF_sBZ_TM8BGf-Nmk8X2oo,7037
+sql_blocks-0.0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-0.0.6.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-0.0.6.dist-info/RECORD,,

sql_blocks-0.0.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=TodC5q-UEdYEz9v1RRoogVqqRcsKnZRY1WDGinrI2zo,26
-sql_blocks/sql_blocks.py,sha256=CX8rJtDvL07eGjwJbiqRKDckvrosJf4_PEBw5SK8mrQ,16051
-sql_blocks-0.0.4.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-0.0.4.dist-info/METADATA,sha256=RoaYK32YS_CAW2UBogLABwxIPPwjqcmZH1EQh-iA2ZQ,7028
-sql_blocks-0.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-0.0.4.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-0.0.4.dist-info/RECORD,,