sql-blocks 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

sql_blocks/sql_blocks.py

@@ -124,14 +124,19 @@ class ForeignKey:
     def __init__(self, table_name: str):
         self.table_name = table_name
 
+    @staticmethod
+    def get_key(obj1: SQLObject, obj2: SQLObject) -> tuple:
+        return obj1.table_name, obj2.table_name
+
     def add(self, name: str, main: SQLObject):
-        key = f'{main.table_name}_{self.table_name}'
-        ForeignKey.references[key] = name
+        key = self.get_key(main, self)
+        ForeignKey.references[key] = (name, '')
 
     @classmethod
-    def find(cls, obj1: SQLObject, obj2: SQLObject) -> list:
-        key = f'{obj1.table_name}_{obj2.table_name}'
-        return cls.references.get(key, '').split('_')
+    def find(cls, obj1: SQLObject, obj2: SQLObject) -> tuple:
+        key = cls.get_key(obj1, obj2)
+        a, b = cls.references.get(key, ('', ''))
+        return a, (b or obj2.key_field)
 
 
 def quoted(value) -> str:
@@ -341,17 +346,17 @@ class Select(SQLObject):
             update_values(key, self.values.get(key, []))
 
     def __add__(self, other: SQLObject):
-        foreign_field, *primary_key = ForeignKey.find(self, other)
+        foreign_field, primary_key = ForeignKey.find(self, other)
         if not foreign_field:
-            foreign_field, *primary_key = ForeignKey.find(other, self)
+            foreign_field, primary_key = ForeignKey.find(other, self)
             if foreign_field:
-                if primary_key:
-                    PrimaryKey.add(primary_key[0], self)
+                if primary_key and not self.key_field:
+                    PrimaryKey.add(primary_key, self)
                 self.add(foreign_field, other)
                 return other
             raise ValueError(f'No relationship found between {self.table_name} and {other.table_name}.')
         elif primary_key:
-            PrimaryKey.add(primary_key[0], other)
+            PrimaryKey.add(primary_key, other)
         other.add(foreign_field, self)
         return self
 
@@ -419,7 +424,7 @@ class Select(SQLObject):
                         fld.strip() for fld in re.split(
                             separator, values[key]
                         ) if len(tables) == 1
-                        or re.findall(f'^[( ]*{obj.alias}\.', fld)
+                        or re.findall(f'^[( ]*{obj.alias}.', fld)
                     ]
                     obj.values[key] = [
                         f'{obj.alias}.{f}' if not '.' in f else f for f in fields

{sql_blocks-0.0.2.dist-info → sql_blocks-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_blocks
-Version: 0.0.2
+Version: 0.0.3
 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
@@ -53,7 +53,6 @@ You can specify your own alias:  `a = Select('Actor a')`
     `a = Select( 'Actor a', age=Between(45, 69) )`
 
     3.2 -- Sub-queries:
-
 ```
 query = Select('Movie m', title=Field,
     id=SubSelect(
@@ -85,6 +84,15 @@ query = Select('Movie m', title=Field,
 ```
 > Could be AND=Options(...)
 
+3.4 -- Negative conditions use the _Not_ class instead of _Where_
+```
+franchise
+based_on_book=Not.is_null()
+```
+
+3.5 -- List of values
+hash_tag=Where.list(['space', 'monster', 'gore'])
+
 ---
 ### 4 - A field can be two things at the same time:
 
@@ -292,5 +300,15 @@ m2 = Select(
 **m1 == m2 # --- True!**
 
 ---
----
 
+### 10 - CASE...WHEN...THEN
+Select(
+    'Product',
+    label=Case('price').when(
+        lt(50), 'cheap'
+    ).when(
+        gt(100), 'expensive'
+    ).else_value(
+        'normal'
+    )
+)

sql_blocks-0.0.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+sql_blocks/__init__.py,sha256=TodC5q-UEdYEz9v1RRoogVqqRcsKnZRY1WDGinrI2zo,26
+sql_blocks/sql_blocks.py,sha256=r_PIxS-VqaY2zuBGwBgz6Z1Z2zBrx_CrfZ35yTMb7Sw,13352
+sql_blocks-0.0.3.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+sql_blocks-0.0.3.dist-info/METADATA,sha256=MHZb5SM_2RCZim4wESLsLaiCYReDOkn7tYJwGNsGWBE,6992
+sql_blocks-0.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sql_blocks-0.0.3.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
+sql_blocks-0.0.3.dist-info/RECORD,,

sql_blocks-0.0.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-sql_blocks/__init__.py,sha256=TodC5q-UEdYEz9v1RRoogVqqRcsKnZRY1WDGinrI2zo,26
-sql_blocks/sql_blocks.py,sha256=V5WKBZg90emr0-jPpFEyX9rtU4VR3JlQKKu1qhlaiH0,13193
-sql_blocks-0.0.2.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-sql_blocks-0.0.2.dist-info/METADATA,sha256=stJ7wQ6iRmHNvf4nJBVr_r5W13Z-ey1ZAllXd8kV9bw,6604
-sql_blocks-0.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sql_blocks-0.0.2.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
-sql_blocks-0.0.2.dist-info/RECORD,,