apexdevkit 1.18.8__tar.gz → 1.18.9__tar.gz

{apexdevkit-1.18.8 → apexdevkit-1.18.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.18.8
+Version: 1.18.9
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.18.8 → apexdevkit-1.18.9}/apexdevkit/query/generator.py

@@ -215,7 +215,7 @@ class MsSqlField:
         return result
 
     def as_order_part(self, is_descending: bool = False) -> str:
-        result = self.alias or self.name
+        result = self.name
 
         if is_descending:
             result += " DESC"
@@ -262,6 +262,34 @@ class MsSqlFooterGenerator:
         raise ForbiddenError(message=f"Invalid field name: {name}")
 
 
+@dataclass
+class MsSqlOrderGenerator:
+    ordering: list[Sort]
+
+    fields: list[MsSqlField] = field(default_factory=list)
+
+    def generate(self) -> str:
+        if not self.ordering:
+            return ""
+
+        clause = ", ".join(self.generate_one(item) for item in self.ordering)
+
+        return f"ORDER BY {clause}"
+
+    def generate_one(self, item: Sort) -> str:
+        return self.field_for(item.name).as_order_part(item.is_descending)
+
+    def field_for(self, name: str) -> MsSqlField:
+        for f in self.fields:
+            if f.alias == name:
+                return f
+
+            if f.alias == "" and f.name == name:
+                return f
+
+        raise ForbiddenError(message=f"Invalid field name: {name}")
+
+
 @dataclass
 class MsSqlSourceGenerator:
     source: str
@@ -318,31 +346,6 @@ class MsSqlConditionGenerator:
                 )
 
 
-@dataclass
-class MsSqlOrderGenerator:
-    ordering: list[Sort]
-
-    fields: list[MsSqlField] = field(default_factory=list)
-
-    def generate(self) -> str:
-        if not self.ordering:
-            return ""
-
-        clause = ", ".join(self.generate_one(item) for item in self.ordering)
-
-        return f"ORDER BY {clause}"
-
-    def generate_one(self, item: Sort) -> str:
-        return self.field_for(item.name).as_order_part(item.is_descending)
-
-    def field_for(self, name: str) -> MsSqlField:
-        for f in self.fields:
-            if f.name == name:
-                return f
-
-        raise ForbiddenError(message=f"Invalid field name: {name}")
-
-
 @dataclass
 class MsSqlPagingGenerator:
     paging: Page
@@ -392,6 +395,9 @@ class OperationEvaluator:
             if f.alias == node.name:
                 return f.name
 
+            if f.alias == "" and f.name == node.name:
+                return f.name
+
         raise ForbiddenError(message=f"Invalid field name: {node.name}")
 
     def _get_raw_value(self, node: Leaf) -> str | None:

{apexdevkit-1.18.8 → apexdevkit-1.18.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.18.8"
+version = "1.18.9"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"