sql-blocks 1.25.517999999999__py3-none-any.whl → 1.25.528999999999__py3-none-any.whl

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:
@@ -880,7 +881,7 @@ class QueryLanguage:
         return  self.join_with_tabs(values, ' AND ')
 
     def sort_by(self, values: list) -> str:
-        if OrderBy.sort == SortType.DESC:
+        if OrderBy.sort == SortType.DESC and OrderBy.ascending(values[-1]):
             values[-1] += ' DESC'
         return self.join_with_tabs(values, ',')
 
@@ -1138,9 +1139,16 @@ class DatabricksLanguage(DataAnalysisLanguage):
         )
 
 
+class FileExtension(Enum):
+    CSV = 'read_csv'
+    XLSX = 'read_excel'
+    JSON = 'read_json'
+    HTML = 'read_html'
+
 class PandasLanguage(DataAnalysisLanguage):
     pattern = '{_from}{where}{select}{group_by}{order_by}'
     has_default = {key: False for key in KEYWORD}
+    file_extension = FileExtension.CSV
 
     def add_field(self, values: list) -> str:
         def line_field_fmt(field: str) -> str:
@@ -1160,7 +1168,9 @@ class PandasLanguage(DataAnalysisLanguage):
         for table in values:
             table, *join = [t.strip() for t in re.split('JOIN|LEFT|RIGHT|ON', table) if t.strip()]
             alias, table = SQLObject.split_alias(table)
-            result += f"\ndf_{table} = pd.read_csv('{table}.csv')"
+            result += "\ndf_{table} = pd.{func}('{table}.{ext}')".format(
+                table=table, func=self.file_extension.value, ext=self.file_extension.name.lower()
+            )
             names[alias] = table
             if join:
                 a1, f1, a2, f2 = [r.strip() for r in re.split('[().=]', join[-1]) if r]
@@ -1188,7 +1198,7 @@ class PandasLanguage(DataAnalysisLanguage):
                     level += 2
                 if '%' in const[2]:
                     level += 1
-                const = f"'{const[1]}'"
+                const = f"'{const[1]}')"
                 op = STR_FUNC[level]
             else:
                 const = ''.join(const)
@@ -1428,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])
@@ -2033,26 +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
-            LEFT JOIN Department d ON (e.depto_id = d.id)
-        WHERE
-            e.name LIKE 'C%'
-        GROUP BY
-            e.gender, d.region
-        ORDER BY
-            d.region DESC
-    ''')
-    print('='*50)
-    print(query)
-    print('-'*50)
-    # Select.DefaultLanguage = DatabricksLanguage
-    Select.DefaultLanguage = PandasLanguage
-    print(query)
-    print('='*50)

{sql_blocks-1.25.517999999999.dist-info → sql_blocks-1.25.528999999999.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=qhzO4tlxBE3dSqDZ-ow1b08H90xDytWXrFMrf6Y-5Og,69096
+sql_blocks-1.25.528999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.528999999999.dist-info/METADATA,sha256=GNAFIVbNrBrijE1PbjoHaaPRIwrC_NbSLEd-VF0WWyc,22235
+sql_blocks-1.25.528999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.528999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.528999999999.dist-info/RECORD,,

sql_blocks-1.25.517999999999.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=hk1wSGny-vY7k4nO94zLsCmM1C2Curi5Cv7hVqa1mUw,69100
-sql_blocks-1.25.517999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.517999999999.dist-info/METADATA,sha256=w2m3bbhDdnCeTqnrzeloyAmBuXX5nkwWqwlPBoPh0ac,22235
-sql_blocks-1.25.517999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.517999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.517999999999.dist-info/RECORD,,