sql-blocks 1.25.420021312__py3-none-any.whl → 1.25.51999999999__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -510,14 +510,16 @@ class ForeignKey:
 
 def quoted(value) -> str:
     if isinstance(value, str):
+        if re.search(r'\bor\b', value, re.IGNORECASE):
+            raise PermissionError('Possible SQL injection attempt')
         value = f"'{value}'"
     return str(value)
 
 
 class Position(Enum):
+    StartsWith = -1
     Middle = 0
-    StartsWith = 1
-    EndsWith = 2
+    EndsWith = 1
 
 
 class Where:
@@ -535,7 +537,9 @@ class Where:
         return cls.__constructor('=', value)
 
     @classmethod
-    def contains(cls, text: str, pos: Position = Position.Middle):
+    def contains(cls, text: str, pos: int | Position = Position.Middle):
+        if isinstance(pos, int):
+            pos = Position(pos)
         return cls(
             "LIKE '{}{}{}'".format(
                 '%' if pos != Position.StartsWith else '',
@@ -652,7 +656,7 @@ class Case:
             '\n'.join(
                 f'\t\tWHEN {field} {cond.content} THEN {res}'
                 for res, cond in self.__conditions.items()
-            ) + f'\n\t\tELSE {default}' if default else '',
+            ) + (f'\n\t\tELSE {default}' if default else ''),
             name
         )
         main.values.setdefault(SELECT, []).append(name)
@@ -677,14 +681,23 @@ class Options:
 
 
 class Between:
+    is_literal: bool = False
+
     def __init__(self, start, end):
         if start > end:
             start, end = end, start
         self.start = start
         self.end = end
 
+    def literal(self) -> Where:
+        return Where('BETWEEN {} AND {}'.format(
+            self.start, self.end
+        ))
+
     def add(self, name: str, main:SQLObject):
-        Where.gte(self.start).add(name, main),
+        if self.is_literal:
+            return self.literal().add(name, main)
+        Where.gte(self.start).add(name, main)
         Where.lte(self.end).add(name, main)
 
 class SameDay(Between):
@@ -695,6 +708,19 @@ class SameDay(Between):
         )
 
 
+class Range(Case):
+    INC_FUNCTION = lambda x: x + 1
+
+    def __init__(self, field: str, values: dict):
+        super().__init__(field)
+        start = 0
+        cls = self.__class__
+        for label, value in sorted(values.items(), key=lambda item: item[1]):
+            self.when(
+                Between(start, value).literal(), label
+            )
+            start = cls.INC_FUNCTION(value)
+
 
 class Clause:
     @classmethod
@@ -1440,7 +1466,6 @@ class MongoParser(Parser):
 
 class Select(SQLObject):
     join_type: JoinType = JoinType.INNER
-    REGEX = {}
     EQUIVALENT_NAMES = {}
 
     def __init__(self, table_name: str='', **values):
@@ -1473,9 +1498,15 @@ class Select(SQLObject):
         for key in USUAL_KEYS:
             main.update_values(key, self.values.get(key, []))
 
-    def __add__(self, other: SQLObject):
+    def copy(self) -> SQLObject:
         from copy import deepcopy
-        query = deepcopy(self)
+        return deepcopy(self)
+
+    def no_relation_error(self, other: SQLObject):
+        raise ValueError(f'No relationship found between {self.table_name} and {other.table_name}.')
+
+    def __add__(self, other: SQLObject):
+        query = self.copy()
         if query.table_name.lower() == other.table_name.lower():
             for key in USUAL_KEYS:
                 query.update_values(key, other.values.get(key, []))
@@ -1488,7 +1519,7 @@ class Select(SQLObject):
                     PrimaryKey.add(primary_key, query)
                 query.add(foreign_field, other)
                 return other
-            raise ValueError(f'No relationship found between {query.table_name} and {other.table_name}.')
+            self.no_relation_error(other) # === raise ERROR ...  ===
         elif primary_key:
             PrimaryKey.add(primary_key, other)
         other.add(foreign_field, query)
@@ -1508,6 +1539,22 @@ class Select(SQLObject):
             if self.diff(key, other.values.get(key, []), True):
                 return False
         return True
+    
+    def __sub__(self, other: SQLObject) -> SQLObject:        
+        fk_field, primary_k = ForeignKey.find(self, other)
+        if fk_field:
+            query = self.copy()
+            other = other.copy()
+        else:
+            fk_field, primary_k = ForeignKey.find(other, self)
+            if not fk_field:
+                self.no_relation_error(other) # === raise ERROR ...  ===
+            query = other.copy()
+            other = self.copy()
+        query.__class__ = NotSelectIN
+        Field.add(fk_field, query)
+        query.add(primary_k, other)
+        return other
 
     def limit(self, row_count: int=100, offset: int=0):
         if Function.dialect == Dialect.SQL_SERVER:
@@ -1799,30 +1846,3 @@ def detect(text: str, join_queries: bool = True, format: str='') -> Select | lis
         result += query
     return result
 # ===========================================================================================//
-
-
-if __name__ == "__main__":
-    query = Select(
-        'Matricula M',
-        aluno_id=Select(
-            'Aluno A',
-            nome=NamedField('nome_aluno'),
-            id=PrimaryKey
-        ),
-        curso=Select(
-            'Curso C',
-            nome=NamedField('nome_curso'),
-            id=PrimaryKey
-        )
-    )
-    print('='*50)
-    print(query)
-    print('-'*50)
-    m, c, a = Select.parse( str(query) )
-    m(inicio=[Not.gt('2024-11-15'), Field])
-    query = m + a
-    print(query)
-    print('-'*50)
-    query.optimize()
-    print(query)
-    print('='*50)

{sql_blocks-1.25.420021312.dist-info → sql_blocks-1.25.51999999999.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 1.25.420021312
+Version: 1.25.51999999999
 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
@@ -15,6 +15,10 @@ License-File: LICENSE
 
 # SQL_Blocks
 
+## _SQL_Blocks_ is useful for building complex SQL commands through smaller query blocks:
+
+---
+
 ### 1 - You can assemble a simple object that will then be converted into an SQL command:
 
 > a = Select('Actor') # --> SELECT * FROM Actor act
@@ -315,6 +319,30 @@ m = Select...
 >> **m + c => Ok!**
 
 
+---
+**8.3 Difference between queries**
+```
+    STATUS_DELIVERED_OK = 93
+    orders = Select('orders',
+        customer_id=ForeignKey('customers'),
+        status=eq(STATUS_DELIVERED_OK)
+    )
+    customers = Select('customers'
+        id=PrimaryKey, name=Field
+    )
+    gap = orders - customers
+```
+return _customers without orders_:
+
+    SELECT
+            c.name
+    FROM
+            customers c
+    WHERE
+            NOT c.id IN (
+                SELECT o.customer_id FROM orders o
+                WHERE o.status = 93
+            )
 ---
 
 ### 9 - Comparing objects
@@ -387,6 +415,31 @@ m2 = Select(
         )
     )
 
+10.1 - If the labels used in the CASE are based on ranges of values ​​in sequence, you can use the **Range class**:
+
+        query = Select(
+            'People p',
+            age_group=Range('age',{  # <<---------- 
+                'adult': 50,
+                'teenager': 17,
+                'child': 10,
+                'elderly': 70,
+                'young': 21,
+            })
+        )
+is equivalent to...
+```
+        SELECT
+                CASE
+                    WHEN p.age BETWEEN 0 AND 10 THEN 'child'
+                    WHEN p.age BETWEEN 11 AND 17 THEN 'teenager'
+                    WHEN p.age BETWEEN 18 AND 21 THEN 'young'
+                    WHEN p.age BETWEEN 22 AND 50 THEN 'adult'
+                    WHEN p.age BETWEEN 51 AND 70 THEN 'elderly'
+                END AS age_group
+        FROM
+                People p
+```
 ---
 
 ### 11 - optimize method

sql_blocks-1.25.51999999999.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
+sql_blocks/sql_blocks.py,sha256=ZdCFtPShmn-nHrE2tpJCWMnJYmPsc742CIkrPc_hSs4,61854
+sql_blocks-1.25.51999999999.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-1.25.51999999999.dist-info/METADATA,sha256=ZK0V4KW5v8VtqFML82WFBbN_NpDN7iHbGjMo09fiRbc,22241
+sql_blocks-1.25.51999999999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-1.25.51999999999.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-1.25.51999999999.dist-info/RECORD,,

sql_blocks-1.25.420021312.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
-sql_blocks/sql_blocks.py,sha256=WkFmxphTnqT74MgGX6JCKLMRmxwDPGXdDmZ8DU-qObs,60834
-sql_blocks-1.25.420021312.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-1.25.420021312.dist-info/METADATA,sha256=qCiTXUBNpwkwBGWXLROxIVo2tz5XgLr5yLJeoYQKAmQ,20708
-sql_blocks-1.25.420021312.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-1.25.420021312.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-1.25.420021312.dist-info/RECORD,,