sql-blocks 1.25.518999999999__tar.gz → 1.25.528999999999__tar.gz

{sql_blocks-1.25.518999999999/sql_blocks.egg-info → sql_blocks-1.25.528999999999}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.518999999999
+Version: 1.25.528999999999
 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-1.25.518999999999 → sql_blocks-1.25.528999999999}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sql_blocks"
-version = "1.25.518999999999"
+version = "1.25.528999999999"
 authors = [
   { name="Julio Cascalles", email="julio.cascalles@outlook.com" },
 ]

{sql_blocks-1.25.518999999999 → sql_blocks-1.25.528999999999}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name = 'sql_blocks',
-    version = '1.25.518999999999',
+    version = '1.25.528999999999',
     author = 'Júlio Cascalles',
     author_email = 'julio.cascalles@outlook.com',
     packages = ['sql_blocks'],

{sql_blocks-1.25.518999999999 → sql_blocks-1.25.528999999999}/sql_blocks/sql_blocks.py

@@ -131,6 +131,7 @@ class SQLObject:
         return s1 - s2
 
     def delete(self, search: str, keys: list=USUAL_KEYS, exact: bool=False):
+        search = re.escape(search)
         if exact:
             not_match = lambda item: not re.search(fr'\w*[.]*{search}$', item)
         else:
@@ -1437,7 +1438,11 @@ class CypherParser(Parser):
                     raise ValueError(f'Unknown function `{func_name}`.')
                 if ':' in token:
                     token, field_alias = token.split(':')
-                    class_type = class_type().As(field_alias)
+                    if extra_classes == [OrderBy]:
+                        class_type = class_type().As(field_alias, OrderBy)
+                        extra_classes = []
+                    else:
+                        class_type = class_type().As(field_alias)
                 class_list = [class_type]
         class_list += extra_classes
         FieldList(token, class_list).add('', self.queries[-1])
@@ -2042,21 +2047,3 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
     return result
 # ===========================================================================================//
 
-
-if __name__ == "__main__":
-    query = detect("""
-        SELECT
-            e.gender, d.region,
-            Avg(e.age)
-        FROM
-            Employees e
-            JOIN Departments d ON (e.depto_id = d.id)
-        WHERE
-            e.name LIKE 'A%'
-        GROUP BY
-            e.gender, d.region
-        ORDER BY
-            d.region DESC
-    """)
-    PandasLanguage.file_extension = FileExtension.XLSX
-    print( query.translate_to(PandasLanguage) )

{sql_blocks-1.25.518999999999 → sql_blocks-1.25.528999999999/sql_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.518999999999
+Version: 1.25.528999999999
 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