sql-blocks 0.31.13__py3-none-any.whl → 0.31.89__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -63,7 +63,7 @@ class SQLObject:
  
     @staticmethod
     def get_separator(key: str) -> str:
-        appendix = {WHERE: 'and|', FROM: 'join|JOIN'}
+        appendix = {WHERE: r'\s+and\s+|', FROM: r'\s+join\s+|\s+JOIN\s+'}
         return KEYWORD[key][0].format(appendix.get(key, ''))
 
     def diff(self, key: str, search_list: list, exact: bool=False) -> set:
@@ -79,7 +79,7 @@ class SQLObject:
                 fld = fld.lower()
             return fld.strip()
         def is_named_field(fld: str) -> bool:
-            return key == SELECT and re.search(' as | AS ', fld)
+            return key == SELECT and re.search(r'\s+as\s+|\s+AS\s+', fld)
         def field_set(source: list) -> set:
             return set(
                 (
@@ -369,10 +369,14 @@ class OrderBy:
     sort: SortType = SortType.ASC
     @classmethod
     def add(cls, name: str, main: SQLObject):
+        def is_function() -> bool:
+            diff = main.diff(SELECT, [name.lower()], True)
+            FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.__subclasses__()}
+            return diff.intersection(FUNCTION_CLASS)
         found = re.findall(r'^_\d', name)
         if found:
             name = found[0].replace('_', '')
-        elif main.alias:
+        elif main.alias and not is_function():
             name = f'{main.alias}.{name}'
         main.values.setdefault(ORDER_BY, []).append(name+cls.sort.value)
 
@@ -476,6 +480,10 @@ class QueryLanguage:
             if not method or (not values and not self.has_default[key]):
                 self.result[ref] = ''
                 continue
+            if key == FROM:
+                values[0] = '{} {}'.format(
+                    self.target.aka(), self.target.alias
+                ).strip()
             text = method(values)
             self.result[ref] = self.prefix(key) + text
         return self.pattern.format(**self.result).strip()
@@ -767,7 +775,7 @@ class CypherParser(Parser):
     REGEX = {}
     CHAR_SET = r'[(,?)^{}[\]]'
     KEYWORDS = '|'.join(
-        fr'\s+{word}\s+'
+        fr'\b{word}\b'
         for word in "where return WHERE RETURN and AND".split()
     )
 
@@ -854,7 +862,11 @@ class CypherParser(Parser):
         else:
             if not curr.values.get(SELECT):
                 raise IndexError(f'Foreign Key not found for {curr.table_name}.')
-            foreign_fld = curr.values[SELECT][0].split('.')[-1]
+            fields = [
+                fld for fld in curr.values[SELECT]
+                if fld not in curr.values.get(GROUP_BY, [])
+            ]
+            foreign_fld = fields[0].split('.')[-1]
             curr.delete(foreign_fld, [SELECT])
             if curr.join_type == JoinType.RIGHT:
                 pk_field, foreign_fld = foreign_fld, pk_field
@@ -1040,12 +1052,16 @@ class Select(SQLObject):
         for value in self.diff(key, new_values):
             self.values.setdefault(key, []).append(value)
 
+    def aka(self) -> str:
+        result = self.table_name
+        return self.EQUIVALENT_NAMES.get(result, result)
+
     def add(self, name: str, main: SQLObject):
         old_tables = main.values.get(FROM, [])
         new_tables = set([
             '{jt}JOIN {tb} {a2} ON ({a1}.{f1} = {a2}.{f2})'.format(
                 jt=self.join_type.value,
-                tb=self.EQUIVALENT_NAMES.get(self.table_name, self.table_name),
+                tb=self.aka(),
                 a1=main.alias, f1=name,
                 a2=self.alias, f2=self.key_field
             )
@@ -1247,9 +1263,19 @@ def detect(text: str) -> Select:
 
 
 if __name__ == "__main__":
-    print('@'*100)
-    print( detect(
-        # 'User(^name?role="Manager",id)<-Contact(requester, guest)->User(id,name)'
-        'User(^name,id) <-Contact(requester,guest)-> User(id,name)'
-    ) )
-    print('@'*100)
+    print('░▒▓▒░'*20)
+    p, c, a = Select.parse(
+        '''
+            Professor(?nome="Júlio Cascalles", id)
+            <- Curso@disciplina(professor, aluno) ->
+            Aluno(id ^count$qtd_alunos)
+        ''', CypherParser
+    )
+    print(p)
+    print('-'*50)
+    print(c)
+    print('-'*50)
+    print(a)
+    print('='*50)
+    print(a + c + p)
+    print('░▒▓▒░'*20)

{sql_blocks-0.31.13.dist-info → sql_blocks-0.31.89.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.31.13
+Version: 0.31.89
 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
@@ -390,7 +390,7 @@ a, c, m = Select.parse(
         <- Cast(actor_id, movie_id) ->
         Movie(id ^title)
     """,
-    Cypher 
+    CypherParser
     # ^^^ recognizes syntax like Neo4J queries
 )
 ```
@@ -466,7 +466,7 @@ print(query)
         db.people.find({
             {
                 $or: [
-                    status:{$eq:"B"},
+                    {status:{$eq:"B"}},
                     age:{$lt:50}
                 ]
             },

sql_blocks-0.31.89.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=nsIT8JEeYHw3KIkzAUHUdzUAR_i2asJmdytsvW0hYKc,43342
+sql_blocks-0.31.89.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-0.31.89.dist-info/METADATA,sha256=xKHVfM76nzvZBr-TYC5_PN4bAvYW9oWoi5ChPIPdbDE,12202
+sql_blocks-0.31.89.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-0.31.89.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-0.31.89.dist-info/RECORD,,

sql_blocks-0.31.13.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=AcA-AOZ4XSXD5srMNsnv43ljPF06_DInTu9ljrzQQMQ,42496
-sql_blocks-0.31.13.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-0.31.13.dist-info/METADATA,sha256=6Ckz7aC4I8tQ1JU-hX_AIMsyw1rw2MzwXRQvOAZ7KII,12195
-sql_blocks-0.31.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-0.31.13.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-0.31.13.dist-info/RECORD,,