sql-blocks 1.25.109__py3-none-any.whl → 1.25.112__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -266,23 +266,38 @@ class Current_Date(Function):
         return super().get_pattern()
 # --------------------------------------------------------
 
-class Aggregate:
+class Frame:
     break_lines: bool = True
 
     def over(self, **args):
-        keywords = ' '.join(
-            '{}{} BY {}'.format(
-                '\n\t\t' if self.break_lines else '',
-                key.upper(), args[key]
-            ) for key in ('partition', 'order')
-            if key in args
-        )
+        """
+        How to use:
+            over(field1=OrderBy, field2=Partition)
+        """
+        keywords = ''
+        for field, obj in args.items():
+            is_valid = any([
+                obj is class_type # or isinstance(obj, class_type)
+                for class_type in (OrderBy, Partition)
+            ])
+            if not is_valid:
+                continue
+            keywords += '{}{} {}'.format(
+                '\n\t\t' if self.break_lines else ' ',
+                obj.cls_to_str(), field
+            )
         if keywords and self.break_lines:
             keywords += '\n\t'
         self.pattern = self.get_pattern() + f' OVER({keywords})'
         return self
 
 
+class Aggregate(Frame):
+    ...
+
+class Window(Frame):
+    ...
+
 # ---- Aggregate Functions: -------------------------------
 class Avg(Aggregate, Function):
     ...
@@ -295,6 +310,17 @@ class Sum(Aggregate, Function):
 class Count(Aggregate, Function):
     ...
 
+# ---- Window Functions: -----------------------------------
+class Row_Number(Window, Function):
+    ... 
+class Rank(Window, Function):
+    ... 
+class Lag(Window, Function):
+    ...
+class Lead(Window, Function):
+    ...
+
+
 # ---- Conversions and other Functions: ---------------------
 class Coalesce(Function):
     ...
@@ -379,10 +405,9 @@ def quoted(value) -> str:
 
 
 class Position(Enum):
-    Middle = "LIKE '%{}%'"
-    StartWith = "LIKE '{}%'"
-    EndsWith = "LIKE '%{}'"
-    RegEx = "REGEXP_LIKE('{}')"
+    Middle = 0
+    StartsWith = 1
+    EndsWith = 2
 
 
 class Where:
@@ -401,7 +426,13 @@ class Where:
 
     @classmethod
     def contains(cls, content: str, pos: Position = Position.Middle):
-        return cls(pos.value.format(content))
+        return cls(
+            "LIKE '{}{}{}'".format(
+                '%' if pos != Position.StartsWith else '',
+                content,
+                '%' if pos != Position.EndsWith else ''
+            )
+        )
    
     @classmethod
     def gt(cls, value):
@@ -481,9 +512,8 @@ class Options:
         self.__children: dict = values
 
     def add(self, logical_separator: str, main: SQLObject):
-        """
-        `logical_separator` must be AND or OR
-        """
+        if logical_separator not in ('AND', 'OR'):
+            raise ValueError('`logical_separator` must be AND or OR')
         conditions: list[str] = []
         child: Where
         for field, child in self.__children.items():
@@ -535,6 +565,16 @@ class OrderBy(Clause):
         name = cls.format(name, main)
         main.values.setdefault(ORDER_BY, []).append(name+cls.sort.value)
 
+    @classmethod
+    def cls_to_str(cls) -> str:
+        return ORDER_BY
+
+PARTITION_BY = 'PARTITION BY'
+class Partition:
+    @classmethod
+    def cls_to_str(cls) -> str:
+        return PARTITION_BY
+
 
 class GroupBy(Clause):
     @classmethod
@@ -1381,6 +1421,31 @@ class RuleDateFuncReplace(Rule):
             target.values[WHERE][i] = ' AND '.join(temp.values[WHERE])
 
 
+class RuleReplaceJoinBySubselect(Rule):
+    @classmethod
+    def apply(cls, target: Select):
+        main, *others = Select.parse( str(target) )
+        modified = False
+        for query in others:
+            fk_field, primary_k = ForeignKey.find(main, query)
+            more_relations = any([
+                ref[0] == query.table_name for ref in ForeignKey.references
+            ])
+            invalid = any([
+                len( query.values.get(SELECT, []) ) > 0,
+                len( query.values.get(WHERE, []) ) == 0,
+                not fk_field, more_relations
+            ])
+            if invalid:
+                continue
+            query.__class__ = SubSelect
+            Field.add(primary_k, query)
+            query.add(fk_field, main)
+            modified = True
+        if modified:
+            target.values = main.values.copy()
+
+
 def parser_class(text: str) -> Parser:
     PARSER_REGEX = [
         (r'select.*from', SQLParser),
@@ -1415,3 +1480,5 @@ def detect(text: str) -> Select:
     for query in query_list[1:]:
         result += query
     return result
+
+

{sql_blocks-1.25.109.dist-info → sql_blocks-1.25.112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.109
+Version: 1.25.112
 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
@@ -97,8 +97,13 @@ query = Select('Movie m', title=Field,
         genre=eq("Sci-Fi"),
         awards=contains("Oscar")
     )
+    AND=Options(
+        ..., name=contains(
+            'Chris',
+            Position.StartsWith
+        )
+    )
 ```
-> Could be AND=Options(...)
 
 3.4 -- Negative conditions use the _Not_ class instead of _Where_
 ```
@@ -363,6 +368,35 @@ m2 = Select(
 
 > The method allows you to select which rules you want to apply in the optimization...Or define your own rules!
 
+>> NOTE: When a joined table is used only as a filter, it is possible that it can be changed to a sub-query:
+
+    query = Select(
+        'Installments i', due_date=Field,  customer=Select(
+            'Customer c', id=PrimaryKey,
+            name=contains('Smith', Position.EndsWith)
+        )
+    )
+    print(query)
+    print('-----')
+    query.optimize([RuleReplaceJoinBySubselect])
+    print(query)
+```
+SELECT
+        i.due_date
+FROM
+        Installments i
+        JOIN Customer c ON (i.customer = c.id)
+WHERE
+        c.name LIKE '%Smith'
+-----
+SELECT
+        i.due_date
+FROM
+        Installments i
+WHERE
+        i.customer IN (SELECT c.id FROM Customer c WHERE c.name LIKE '%Smith')
+```
+
 ---
 
 ### 12 - Adding multiple fields at once
@@ -567,3 +601,27 @@ GROUP BY
 ORDER BY
         customer_count
 ```
+---
+### 16 - Function classes
+You may use this functions:
+* SubString
+* Round
+* DateDiff
+* Year
+* Current_Date
+* Avg
+* Min
+* Max
+* Sum
+* Count
+* Lag
+* Lead
+* Row_Number
+* Rank
+* Coalesce
+* Cast
+> Some of these functions may vary in syntax depending on the database.
+For example, if your query is going to run on Oracle, do the following:
+
+`Function.dialect = Dialect.ORACLE`
+

sql_blocks-1.25.112.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=X13qSCvVhu-BVXdUmqXi48Z7H4THBvXHrP5zw2Hm4wM,49491
+sql_blocks-1.25.112.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.112.dist-info/METADATA,sha256=npxMGB0xgAFt4J_IgoIaaWmVFcVoNu5lq3qnUAjhb-A,14638
+sql_blocks-1.25.112.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.112.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.112.dist-info/RECORD,,

sql_blocks-1.25.109.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=OnIlTb03DTgK_U8QBnXQtQ-rKrkSuKNj1hjJiHogmYE,47639
-sql_blocks-1.25.109.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.109.dist-info/METADATA,sha256=TRybMQgmXhlz14FxEV6f4rg0-gTPpveyQi3xEYPdZ1w,13425
-sql_blocks-1.25.109.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.109.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.109.dist-info/RECORD,,