sql-blocks 0.31.13__py3-none-any.whl → 0.31.21__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(
                 (
@@ -476,6 +476,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 +771,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()
     )
 
@@ -1040,12 +1044,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
             )
@@ -1249,7 +1257,10 @@ 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)'
+        '''
+            Company(?jobs > 10, id)
+            <- Person(work_at ^name, friend_of) ->
+            Person(id ?skill="pANDas")
+        '''                #   ^^^---- Test for confusion with the AND operator
     ) )
     print('@'*100)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.31.13
+Version: 0.31.21
 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.31.21.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=jtK4yfyLCQZYrom2Aj_En6Hvlc3mbvAI1TOnC4AK72U,42823
+sql_blocks-0.31.21.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-0.31.21.dist-info/METADATA,sha256=lDrOFqAT1hC8lEp9plVXngNJ7m_2ZnJ8qRywx_PVUCo,12195
+sql_blocks-0.31.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-0.31.21.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-0.31.21.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,,