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

sql_blocks/sql_blocks.py

@@ -472,9 +472,14 @@ class Where:
 
     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)
-        else:
+        elif not exists:
             name = Field.format(name, main)
         main.values.setdefault(WHERE, []).append('{}{} {}'.format(
             self.prefix, name, self.expr
@@ -1553,7 +1558,9 @@ if __name__ == '__main__':
     query = Select(
         'Tips t',
         tip=[Field, Lag().over(day=OrderBy).As('last')],
-        diff=ExpressionField('Round(tip-last, 2) as {f}'),
-        Row_Number=gt(1)
+        diff=[
+            ExpressionField('Round(tip-last, 2) as {f}'),
+            Not.is_null()
+        ]
     )
     print(query)

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

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

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