sql-blocks 1.25.1801__py3-none-any.whl → 1.25.19011745__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -335,6 +335,9 @@ class Cast(Function):
     ...
 
 
+FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.__subclasses__()}
+
+
 class ExpressionField:
     def __init__(self, expr: str):
         self.expr = expr
@@ -468,8 +471,18 @@ class Where:
         return cls(f'IN ({values})')
 
     def add(self, name: str, main: SQLObject):
+        func_type = FUNCTION_CLASS.get(name.lower())
+        exists = any(
+            main.is_named_field(fld, SELECT)
+            for fld in main.values.get(SELECT, [])
+            if name in fld
+        )
+        if func_type:
+            name = func_type.format('*', main)
+        elif not exists:
+            name = Field.format(name, main)
         main.values.setdefault(WHERE, []).append('{}{} {}'.format(
-            self.prefix, Field.format(name, main), self.expr
+            self.prefix, name, self.expr
         ))
 
 
@@ -549,7 +562,6 @@ class Clause:
     def format(cls, name: str, main: SQLObject) -> str:
         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:
@@ -1068,7 +1080,6 @@ class CypherParser(Parser):
                 Count().As(token, extra_classes).add(pk_field, self.queries[-1])
                 return
             else:
-                FUNCTION_CLASS = {f.__name__.lower(): f for f in Function.__subclasses__()}
                 class_list = [ FUNCTION_CLASS[func_name] ]
         class_list += extra_classes
         FieldList(token, class_list).add('', self.queries[-1])
@@ -1544,14 +1555,12 @@ def detect(text: str, join_queries: bool = True) -> Select:
 
 
 if __name__ == '__main__':
-    for dialect in Dialect:
-        Function.dialect = dialect
-        print(f'--------------{dialect.name}--------------')
-        query = Select(
-            'Installments',
-            _=DateDiff(
-                Current_Date(),
-                'due_date'
-            ).As('elapsed_time')
-        ).limit(10)
-        print(query)
+    query = Select(
+        'Tips t',
+        tip=[Field, Lag().over(day=OrderBy).As('last')],
+        diff=[
+            ExpressionField('Round(tip-last, 2) as {f}'),
+            Not.is_null()
+        ]
+    )
+    print(query)

{sql_blocks-1.25.1801.dist-info → sql_blocks-1.25.19011745.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=lPUpYOLHjvx84EVjlydJK03rm7qG1DWotRtqyldKqvo,52020
+sql_blocks-1.25.19011745.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.19011745.dist-info/METADATA,sha256=KPw30aPiITpjBHpfWU9yAuTtr8aQ5cW5cdIdzM4iD0k,15031
+sql_blocks-1.25.19011745.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.19011745.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.19011745.dist-info/RECORD,,

sql_blocks-1.25.1801.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=iFS3drlQaazFkbBBFIH58RPZt4Lhe6R2Xqi_Ujef7Bg,51893
-sql_blocks-1.25.1801.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.1801.dist-info/METADATA,sha256=WnwFnhle4YXNyeC6dBVAnQmUqJiboT1CDhbvRHOmEQY,15027
-sql_blocks-1.25.1801.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.1801.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.1801.dist-info/RECORD,,