sql-blocks 1.25.37022003__py3-none-any.whl → 1.25.38021329__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -196,17 +196,35 @@ class Dialect(Enum):
     POSTGRESQL = 3
     MYSQL = 4
 
+SQL_TYPES = 'CHAR INT DATE FLOAT ANY'.split()
+CHAR, INT, DATE, FLOAT, ANY  =  SQL_TYPES
+
 class Function:
     dialect = Dialect.ANSI
-    need_params = True
+    inputs = None
+    output = None
     separator = ', '
+    auto_convert = True
+    append_param = False
 
     def __init__(self, *params: list):
+        def set_func_types(param):
+            if self.auto_convert and isinstance(param, Function):
+                func = param
+                main_param = self.inputs[0]
+                unfriendly = all([
+                    func.output != main_param,
+                    func.output != ANY,
+                    main_param  != ANY
+                ])
+                if unfriendly:
+                    return Cast(func, main_param)
+            return param
         # --- Replace class methods by instance methods: ------
         self.add = self.__add
         self.format = self.__format
         # -----------------------------------------------------
-        self.params = list(params)
+        self.params = [set_func_types(p) for p in params]
         self.field_class = Field
         self.pattern = self.get_pattern()
         self.extra = {}
@@ -231,12 +249,14 @@ class Function:
             param for param in self.params if isinstance(param, Function)
         ]
         for func in nested_functions:
-            if func.need_params:
+            if func.inputs:
                 func.set_main_param(name, main)
                 return
-        self.params = [
-            Field.format(name, main)
-        ] + self.params
+        new_params = [Field.format(name, main)]
+        if self.append_param:
+            self.params += new_params
+        else:
+            self.params = new_params + self.params         
 
     def __format(self, name: str, main: SQLObject) -> str:
         if name not in '*_':
@@ -260,6 +280,9 @@ class Function:
 
 # ---- String Functions: ---------------------------------
 class SubString(Function):
+    inputs = [CHAR, INT, INT]
+    output = CHAR
+
     def get_pattern(self) -> str:
         if self.dialect in (Dialect.ORACLE, Dialect.MYSQL):
             return 'Substr({params})'
@@ -267,33 +290,54 @@ class SubString(Function):
 
 # ---- Numeric Functions: --------------------------------
 class Round(Function):
-    ...
+    inputs = [FLOAT]
+    output = FLOAT
 
 # --- Date Functions: ------------------------------------
 class DateDiff(Function):
-    def get_pattern(self) -> str:
+    inputs = [DATE]
+    output = DATE
+    append_param = True
+
+    def __str__(self) -> str:
         def is_field_or_func(name: str) -> bool:
-            return re.sub('[()]', '', name).isidentifier()
-        params = [str(p) for p in self.params]
+            candidate = re.sub(
+                '[()]', '', name.split('.')[-1]
+            )
+            return candidate.isidentifier()
         if self.dialect != Dialect.SQL_SERVER:
+            params = [str(p) for p in self.params]
             return ' - '.join(
                 p if is_field_or_func(p) else f"'{p}'"
                 for p in params
             )  # <====  Date subtract
-        return super().get_pattern()
+        return super().__str__()
+
+
+class DatePart(Function):
+    inputs = [DATE]
+    output = INT
 
-class Year(Function):
     def get_pattern(self) -> str:
+        interval = self.__class__.__name__
         database_type = {
-            Dialect.ORACLE: 'Extract(YEAR FROM {params})',
-            Dialect.POSTGRESQL: "Date_Part('year', {params})",
+            Dialect.ORACLE: 'Extract('+interval+' FROM {params})',
+            Dialect.POSTGRESQL: "Date_Part('"+interval+"', {params})",
         }
         if self.dialect in database_type:
             return database_type[self.dialect]
         return super().get_pattern()
 
+class Year(DatePart):
+    ...
+class Month(DatePart):
+    ...
+class Day(DatePart):
+    ...
+
+
 class Current_Date(Function):
-    need_params = False
+    output = DATE
 
     def get_pattern(self) -> str:
         database_type = {
@@ -364,8 +408,12 @@ class Lead(Window, Function):
 
 # ---- Conversions and other Functions: ---------------------
 class Coalesce(Function):
-    ...
+    inputs = [ANY]
+    output = ANY
+    
 class Cast(Function):
+    inputs = [ANY]
+    output = ANY
     separator = ' As '
 
 
@@ -1728,4 +1776,4 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
     for query in query_list[1:]:
         result += query
     return result
-# ===========================================================================================//
+# ===========================================================================================//

{sql_blocks-1.25.37022003.dist-info → sql_blocks-1.25.38021329.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.37022003
+Version: 1.25.38021329
 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
@@ -693,6 +693,22 @@ Results...
     SELECT ...
     SubString(Cast(event_date As char), 12, 19) as time
 ```
+
+>> `Function.auto_convert` option (default: True)
+
+- Put Cast(...) when there is a difference between the types of the parameter and the return of the nested function
+```
+birth=Round( DateDiff(Current_Date()) ).As('age')
+```
+...Returns...
+```
+SELECT
+    Round(
+        Cast(Current_Date() - p.birth As FLOAT)
+       /* ^^^  */
+    ) as age
+...
+```
 ---
 
 ### 17 - CTE and Recursive classes

sql_blocks-1.25.38021329.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=5LQPEOkvMylJJxoU2m1P6pAhfcMHVdsnTiYgfLLJ5bQ,59477
+sql_blocks-1.25.38021329.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.38021329.dist-info/METADATA,sha256=un6TFbAfNbyhIrjLzHpvG1Yy77jsyZCw2xy_i3tMw2k,20511
+sql_blocks-1.25.38021329.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.38021329.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.38021329.dist-info/RECORD,,

sql_blocks-1.25.37022003.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=kaI6nCcq1X3CenGFP4HkKkk3rsDt_jts8xErg-ml7dk,58217
-sql_blocks-1.25.37022003.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.37022003.dist-info/METADATA,sha256=AUa01HeqYtgwVObYWMTkqixy0RNoxwNQXurTMEWjjQ8,20146
-sql_blocks-1.25.37022003.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.37022003.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.37022003.dist-info/RECORD,,