sql-blocks 1.25.1__py3-none-any.whl → 1.25.13__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -151,49 +151,47 @@ class NamedField:
 
 
 class Function:
-    instance: dict = {}
-
     def __init__(self, *params: list):
-        func_name = self.__class__.__name__
-        Function.instance[func_name] = self
+        # --- Replace class methods by instance methods: ------
+        self.add = self.__add
+        self.format = self.__format
+        # -----------------------------------------------------
         self.params = [str(p) for p in params]
-        self.class_type = Field
+        self.field_class = Field
         self.pattern = '{}({})'
         self.extra = {}
     
     def As(self, field_alias: str, modifiers=None):
         if modifiers:
             self.extra[field_alias] = TO_LIST(modifiers)
-        self.class_type = NamedField(field_alias)
+        self.field_class = NamedField(field_alias)
         return self
 
-    @classmethod
-    def format(cls, name: str, main: SQLObject) -> str:
-        obj = cls.get_instance()
-        params = [
-            Field.format(name, main)
-        ] + obj.params
-        return obj.pattern.format(
-            cls.__name__,
+    def __format(self, name: str, main: SQLObject) -> str:
+        if name in '*_' and self.params:
+            params = self.params
+        else:
+            params = [
+                Field.format(name, main)
+            ] + self.params
+        return self.pattern.format(
+            self.__class__.__name__,
             ', '.join(params)
         )
 
+    @classmethod
+    def format(cls, name: str, main: SQLObject):
+        return cls().__format(name, main)
+
     def __add(self, name: str, main: SQLObject):
         name = self.format(name, main)
-        self.class_type.add(name, main)
+        self.field_class.add(name, main)
         if self.extra:
             main.__call__(**self.extra)
 
-    @classmethod
-    def get_instance(cls):
-        obj = Function.instance.get(cls.__name__)
-        if not obj:
-            obj = cls()
-        return obj
-
     @classmethod
     def add(cls, name: str, main: SQLObject):
-        cls.get_instance().__add(name, main)
+        cls().__add(name, main)
 
 
 # ---- String Functions: ---------------------------------
@@ -1356,3 +1354,12 @@ def detect(text: str) -> Select:
     for query in query_list[1:]:
         result += query
     return result
+
+if __name__ == "__main__":
+    OrderBy.sort = SortType.DESC
+    query = Select(
+        'order_Detail d',
+        customer_id=GroupBy,
+        _=Sum('d.unitPrice * d.quantity').As('total', OrderBy)
+    )
+    print(query)

{sql_blocks-1.25.1.dist-info → sql_blocks-1.25.13.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=P5yp0Ug4PD56xklmQOtpNLKm9hfhHBNb8TDkOneNAHw,45783
+sql_blocks-1.25.13.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.13.dist-info/METADATA,sha256=tahTyaVcsa4ROoxQSMK41W6m20bVlDs6_kh9b9mkgoc,13424
+sql_blocks-1.25.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.13.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.13.dist-info/RECORD,,

sql_blocks-1.25.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=JYATgw-J3SzAVCYZpdNGyc7rK700jHJtOWbK9gxywu4,45466
-sql_blocks-1.25.1.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.1.dist-info/METADATA,sha256=k6Xd3FtNhl3KHAOzVA0zkx5TvQdcb2P5st6-fEm7r4M,13423
-sql_blocks-1.25.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.1.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.1.dist-info/RECORD,,