hypern 0.3.3__cp310-cp310-win32.whl → 0.3.4__cp310-cp310-win32.whl

hypern/application.py

@@ -436,8 +436,6 @@ class Hypern:
         server.set_auto_compression(enabled=self.auto_compression)
         server.set_mem_pool_capacity(min_capacity=self.args.min_capacity, max_capacity=self.args.max_capacity)
 
-        server.optimize_routes()
-
         if self.database_config:
             server.set_database_config(config=self.database_config)
         if self.start_up_handler:

hypern/db/sql/field.py

@@ -437,7 +437,7 @@ class ArrayField(Field):
 class ForeignKey(Field):
     """Foreign key field representing a relationship to another model."""
 
-    def __init__(self, to_model: str, on_delete: str = "CASCADE", on_update: str = "CASCADE", **kwargs):
+    def __init__(self, to_model: str, related_field: str, on_delete: str = "CASCADE", on_update: str = "CASCADE", **kwargs):
         """
         Initialize a foreign key field.
 
@@ -455,6 +455,7 @@ class ForeignKey(Field):
         self.to_model = to_model
         self.on_delete = on_delete
         self.on_update = on_update
+        self.related_field = related_field
 
     def to_py_type(self, value: Any) -> Optional[int]:
         """

hypern/db/sql/model.py

@@ -109,7 +109,7 @@ class Model(metaclass=MetaModel):
 
     @classmethod
     def _get_foreign_key_sql(cls, name, field) -> str:
-        return f"FOREIGN KEY ({name}) REFERENCES {field.to_model}(id) ON DELETE {field.on_delete} ON UPDATE {field.on_update}"
+        return f"FOREIGN KEY ({name}) REFERENCES {field.to_model}({field.related_field}) ON DELETE {field.on_delete} ON UPDATE {field.on_update}"
 
     def save(self):
         query_object = QuerySet(self)

hypern/db/sql/query.py

@@ -1,5 +1,6 @@
 from enum import Enum
 from typing import Any, Dict, List, Tuple, Union
+from hypern.db.sql.field import ForeignKey
 
 
 class JoinType(Enum):
@@ -98,7 +99,7 @@ class F:
     """Class for creating SQL expressions and column references"""
 
     def __init__(self, field: str):
-        self.field = field.replace("__", ".")  # Handle Django-style field references
+        self.field = field.replace("__", ".")
 
     def __add__(self, other):
         if isinstance(other, F):
@@ -356,6 +357,7 @@ class QuerySet:
         self._nowait = False
         self._skip_locked = False
         self._param_counter = 1
+        self._selected_related = set()
 
     def __get_next_param(self):
         param_name = f"${self._param_counter}"
@@ -372,11 +374,12 @@ class QuerySet:
         new_qs._nowait = self._nowait
         new_qs._skip_locked = self._skip_locked
         new_qs._param_counter = self._param_counter
+        new_qs._selected_related = self._selected_related.copy()
         return new_qs
 
     def select(self, *fields, distinct: bool = False) -> "QuerySet":
         qs = self.clone()
-        qs.query_parts["select"] = list(fields)
+        qs.query_parts["select"] = list(map(lambda x: f"{qs.model.Meta.table_name}.{x}" if x != "*" else x, fields))
         qs._distinct = distinct
         return qs
 
@@ -426,10 +429,10 @@ class QuerySet:
         return self._process_standard_value(field, op, value)
 
     def _process_f_value(self, field: str, op: str, value: F) -> Tuple[str, List]:
-        return f"{field} {op} {value.field}", []
+        return f"{self.model.Meta.table_name}.{field} {op} {value.field}", []
 
     def _process_expression_value(self, field: str, op: str, value: Expression) -> Tuple[str, List]:
-        return f"{field} {op} {value.sql}", value.params
+        return f"{self.model.Meta.table_name}.{field} {op} {value.sql}", value.params
 
     def _process_standard_value(self, field: str, op: str, value: Any) -> Tuple[str, List]:
         op_map = {
@@ -453,25 +456,26 @@ class QuerySet:
             return self._process_op_map_value(field, op, value, op_map)
         else:
             param_name = self.__get_next_param()
-            return f"{field} = {param_name}", [value]
+            return f"{self.model.Meta.table_name}.{field} = {param_name}", [value]
 
     def _process_op_map_value(self, field: str, op: str, value: Any, op_map: dict) -> Tuple[str, List]:
         param_name = self.__get_next_param()
+        combine_field_name = f"{self.model.Meta.table_name}.{field}"
         if op in ("contains", "icontains"):
-            return f"{field} {op_map[op]} {param_name}", [f"%{value}%"]
+            return f"{combine_field_name} {op_map[op]} {param_name}", [f"%{value}%"]
         elif op == "startswith":
-            return f"{field} {op_map[op]} {param_name}", [f"{value}%"]
+            return f"{combine_field_name} {op_map[op]} {param_name}", [f"{value}%"]
         elif op == "endswith":
-            return f"{field} {op_map[op]} {param_name}", [f"%{value}"]
+            return f"{combine_field_name} {op_map[op]} {param_name}", [f"%{value}"]
         elif op == "isnull":
-            return f"{field} {Operator.IS_NULL.value if value else Operator.IS_NOT_NULL.value}", []
+            return f"{combine_field_name} {Operator.IS_NULL.value if value else Operator.IS_NOT_NULL.value}", []
         elif op == "between":
-            return f"{field} {op_map[op]} {param_name} AND {param_name}", [value[0], value[1]]
+            return f"{combine_field_name} {op_map[op]} {param_name} AND {param_name}", [value[0], value[1]]
         elif op in ("in", "not_in"):
             placeholders = ",".join(["{param_name}" for _ in value])
-            return f"{field} {op_map[op]} ({placeholders})", list(value)
+            return f"{combine_field_name} {op_map[op]} ({placeholders})", list(value)
         else:
-            return f"{field} {op_map[op]} {param_name}", [value]
+            return f"{combine_field_name} {op_map[op]} {param_name}", [value]
 
     def where(self, *args, **kwargs) -> "QuerySet":
         qs = self.clone()
@@ -535,22 +539,36 @@ class QuerySet:
             elif field.startswith("-"):
                 order_parts.append(f"{field[1:]} DESC")
             else:
-                order_parts.append(f"{field} ASC")
+                order_parts.append(f"{qs.model.Meta.table_name}.{field} ASC")
 
         qs.query_parts["order_by"] = order_parts
         return qs
 
-    def join(self, table: str, on: Union[str, Expression], join_type: Union[str, JoinType] = JoinType.INNER) -> "QuerySet":
+    def select_related(self, *fields) -> "QuerySet":
+        """
+        Include related objects in the query results.
+
+        Args:
+            *fields: Names of foreign key fields to include
+        """
+        qs = self.clone()
+        for field in fields:
+            if field in qs.model._fields and isinstance(qs.model._fields[field], ForeignKey):
+                qs._selected_related.add(field)
+        return qs
+
+    def join(self, table: Any, on: Union[str, Expression], join_type: Union[str, JoinType] = JoinType.INNER) -> "QuerySet":
         qs = self.clone()
+        joined_table = table.Meta.table_name if hasattr(table, "Meta") else table
 
         if isinstance(join_type, JoinType):
             join_type = join_type.value
 
         if isinstance(on, Expression):
-            qs.query_parts["joins"].append(f"{join_type} {table} ON {on.sql}")
+            qs.query_parts["joins"].append(f"{join_type} {joined_table} ON {on.sql}")
             qs.params.extend(on.params)
         else:
-            qs.query_parts["joins"].append(f"{join_type} {table} ON {on}")
+            qs.query_parts["joins"].append(f"{join_type} {joined_table} ON {on}")
 
         return qs
 
@@ -565,7 +583,7 @@ class QuerySet:
                 group_parts.append(field.sql)
                 qs.params.extend(field.params)
             else:
-                group_parts.append(str(field))
+                group_parts.append(f"{qs.model.Meta.table_name}.{field}")
 
         qs.query_parts["group_by"] = group_parts
         return qs
@@ -607,7 +625,7 @@ class QuerySet:
                 partition_parts.append(field.sql)
                 qs.params.extend(field.params)
             else:
-                partition_parts.append(str(field))
+                partition_parts.append(f"{self.model.Meta.table_name}.{field}")
         return f"PARTITION BY {', '.join(partition_parts)}"
 
     def _process_order_by(self, order_by: List, qs: "QuerySet") -> str:
@@ -619,9 +637,9 @@ class QuerySet:
                 order_parts.append(field.sql)
                 qs.params.extend(field.params)
             elif field.startswith("-"):
-                order_parts.append(f"{field[1:]} DESC")
+                order_parts.append(f"{qs.model.Meta.table_name}.{field[1:]} DESC")
             else:
-                order_parts.append(f"{field} ASC")
+                order_parts.append(f"{qs.model.Meta.table_name}.{field} ASC")
         return f"ORDER BY {', '.join(order_parts)}"
 
     def limit(self, limit: int) -> "QuerySet":
@@ -726,7 +744,14 @@ class QuerySet:
         select_clause = "SELECT"
         if self._distinct:
             select_clause += " DISTINCT"
-        select_clause += " " + ", ".join(self.query_parts["select"])
+
+        # Add selected fields
+        select_related_fields = []
+        for field in self._selected_related:
+            related_table = self.model._fields[field].to_model
+            select_related_fields.append(f"{related_table}.*")
+
+        select_clause += " " + ", ".join(self.query_parts["select"] + select_related_fields)
         parts.append(select_clause)
 
     def _add_from_clause(self, parts):

hypern/hypern.pyi

@@ -191,7 +191,6 @@ class Server:
     def set_auto_compression(self, enabled: bool) -> None: ...
     def set_database_config(self, config: DatabaseConfig) -> None: ...
     def set_mem_pool_capacity(self, min_capacity: int, max_capacity: int) -> None: ...
-    def optimize_routes(self) -> None: ...
 
 class Route:
     path: str

{hypern-0.3.3.dist-info → hypern-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hypern
-Version: 0.3.3
+Version: 0.3.4
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{hypern-0.3.3.dist-info → hypern-0.3.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-hypern-0.3.3.dist-info/METADATA,sha256=VDUnlR9iin2qEAagUwnOdvZL1vC4dMeNM1oBrwl-rZ8,3819
-hypern-0.3.3.dist-info/WHEEL,sha256=HVA0wOUnIw3WSu8DET4aOHFt1dH_siSsnV6db_YgIxE,92
-hypern-0.3.3.dist-info/licenses/LICENSE,sha256=qbYKAIJLS6jYg5hYncKE7OtWmqOtpVTvKNkwOa0Iwwg,1328
-hypern/application.py,sha256=TZKwSHpWSOaValZtogmMO18l8U_xOpFN7cARMFK1hns,18432
+hypern-0.3.4.dist-info/METADATA,sha256=wJ9_iA8bw0-Sc-a3AtzB0aCWhN4iPavHZjQfZgEpats,3819
+hypern-0.3.4.dist-info/WHEEL,sha256=HVA0wOUnIw3WSu8DET4aOHFt1dH_siSsnV6db_YgIxE,92
+hypern-0.3.4.dist-info/licenses/LICENSE,sha256=qbYKAIJLS6jYg5hYncKE7OtWmqOtpVTvKNkwOa0Iwwg,1328
+hypern/application.py,sha256=DCYFtU8e8NhQtmfaXbUfOxR2_Y3fEn-pzce9OOs6S4U,18396
 hypern/args_parser.py,sha256=zTfLfBoKBvYWxdPjabTfZsCtYF3La3PT0TD8dfLMeM4,2815
 hypern/auth/authorization.py,sha256=-NprZsI0np889ZN1fp-MiVFrPoMNzUtatBJaCMtkllM,32
 hypern/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,9 +32,9 @@ hypern/db/nosql/addons/password.py,sha256=jfZxvWFm6nV9EWpXq5Mj-jpqnl9QbokZj9WT14
 hypern/db/nosql/addons/unicode.py,sha256=LaDpLfdoTcJuASPE-8fqOVD05H_uOx8gOdnyDn5Iu0c,268
 hypern/db/nosql/addons/__init__.py,sha256=WEtPM8sPHilvga7zxwqvINeTkF0hdcfgPcAnHc4MASE,125
 hypern/db/nosql/__init__.py,sha256=MH9YvlbRlbBCrQVNOdfTaK-hINwJxbJLmxwY9Mei7I8,644
-hypern/db/sql/field.py,sha256=_5Et9pPmTI_bhUFN7PgdSiozip-Iv0eH2491J_WUvXU,20009
-hypern/db/sql/model.py,sha256=5GtH3v6LfYIENlBN1NpIjZpsYFQyo36jX-b6jO1lNdU,3894
-hypern/db/sql/query.py,sha256=_kBZbdQckYyawSIcuaUrE4C6eWgpeWyK1JVR3JWdh60,31964
+hypern/db/sql/field.py,sha256=tSs8iaYjy-K6nplJJ-1X4OQddzW76cfBlx9xTrG_NbQ,20073
+hypern/db/sql/model.py,sha256=BLRmOlmfn6ibedR9Bv_rHErSruudJ24B9-nDbRHqWm4,3913
+hypern/db/sql/query.py,sha256=MXiphm4pXBz6Axbdoc5rg11XEmw_UahTCdppowyXJxY,33329
 hypern/db/sql/__init__.py,sha256=lCOGNTHaXNSJbuLLIOe2IWWNmX0MFQFPNCl2yytD2Xs,261
 hypern/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hypern/enum.py,sha256=KcVziJj7vWvyie0r2rtxhrLzdtkZAsf0DY58oJ4tQl4,360
@@ -44,7 +44,7 @@ hypern/gateway/gateway.py,sha256=26K2qvJUR-0JnN4IlhwvSSt7EYcpYrBVDuzZ1ivQQ34,147
 hypern/gateway/proxy.py,sha256=w1wcTplDnVrfjn7hb0M0yBVth5TGl88irF-MUYHysQQ,2463
 hypern/gateway/service.py,sha256=PkRaM08olqM_j_4wRjEJCR8X8ZysAF2WOcfhWjaX2eo,1701
 hypern/gateway/__init__.py,sha256=TpFWtqnJerW1-jCWq5fjypJcw9Y6ytyrkvkzby1Eg0E,235
-hypern/hypern.pyi,sha256=4qHekIzH-I6CYch8PwYMus9Ou-JI901kgaLOGsnlOog,9389
+hypern/hypern.pyi,sha256=yXaWGPt598gwPN-CT1ARDdwOSqryZCBFuDLQC8gRd1U,9345
 hypern/i18n/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hypern/logging/logger.py,sha256=WACam_IJiCMXX0hGVKMGSxUQpY4DgAXy7M1dD3q-Z9s,3256
 hypern/logging/__init__.py,sha256=6eVriyncsJ4J73fGYhoejv9MX7aGTkRezTpPxO4DX1I,52
@@ -80,5 +80,5 @@ hypern/ws/route.py,sha256=fGQ2RC708MPOiiIHPUo8aZ-oK379TTAyQYm4htNA5jM,803
 hypern/ws/__init__.py,sha256=dhRoRY683_rfPfSPM5qUczfTuyYDeuLOCFxY4hIdKt8,131
 hypern/ws.py,sha256=F6SA2Z1KVnqTEX8ssvOXqCtudUS4eo30JsiIsvfbHnE,394
 hypern/__init__.py,sha256=9Ww_aUQ0vJls0tOq7Yw1_TVOCRsa5bHJ-RtnSeComwk,119
-hypern/hypern.cp310-win32.pyd,sha256=UG5K9FFyd-gT5lFBkOff3MhU_DTJnyLbInAA2PI8qKs,9836032
-hypern-0.3.3.dist-info/RECORD,,
+hypern/hypern.cp310-win32.pyd,sha256=eUc0V3DWmjWn8gTIYvxXkVt2xQiHMTAhBeX9h0B2d00,9796608
+hypern-0.3.4.dist-info/RECORD,,