apexdevkit 1.17.16__tar.gz → 1.17.17__tar.gz

{apexdevkit-1.17.16 → apexdevkit-1.17.17}/PKG-INFO

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

{apexdevkit-1.17.16 → apexdevkit-1.17.17}/apexdevkit/repository/mssql.py

@@ -246,19 +246,32 @@ class DefaultSqlTable(SqlTable[ItemT]):
         placeholders = ", ".join(
             [f"%({key.name})s" for key in self.fields if key.include_in_insert]
         )
-        output = ", ".join(
-            ["INSERTED." + field.name + " AS " + field.name for field in self.fields]
-        )
+        try:
+            self.fields.id
+            output = ", ".join(
+                ["[" + field.name + "] AS " + field.name for field in self.fields]
+            )
+            where_statement = f"""
+                FROM [{self.schema}].[{self.table}]
+                {self.fields.where_statement(include_id=True, read_id=True)}
+            """
+        except ValueError:
+            output = ", ".join(
+                ["%(" + field.name + ")s AS " + field.name for field in self.fields]
+            )
+            where_statement = ""
 
         return DatabaseCommand(f"""
             {self._user_check}
             INSERT INTO [{self.schema}].[{self.table}] (
                 {columns}
-            ) OUTPUT
-                {output}
+            )
             VALUES (
                 {placeholders}
-            )
+            );
+            SELECT
+                {output}
+            {where_statement}
             REVERT
         """).with_data(self.fields.with_fixed(self.formatter.dump(item)))
 

{apexdevkit-1.17.16 → apexdevkit-1.17.17}/apexdevkit/repository/sql.py

@@ -140,12 +140,12 @@ class SqlFieldManager:
     def __iter__(self) -> Iterator[_SqlField]:
         yield from self.fields
 
-    def where_statement(self, include_id: bool = False) -> str:
+    def where_statement(self, include_id: bool = False, read_id: bool = False) -> str:
         statements = [
             statement
             for statement in [
                 self._parent_filter(),
-                self._id_filter(include_id),
+                self._id_filter(include_id, read_id),
                 self._general_filters(),
             ]
             if statement != ""
@@ -177,11 +177,15 @@ class SqlFieldManager:
         else:
             return ""
 
-    def _id_filter(self, include_id: bool = False) -> str:
+    def _id_filter(self, include_id: bool, read_id: bool) -> str:
         return (
             self.key_formatter.replace("x", self.id)
             + " = "
-            + self.value_formatter.replace("x", self.id)
+            + (
+                self.value_formatter.replace("x", self.id)
+                if not read_id
+                else "SCOPE_IDENTITY()"
+            )
             if include_id
             else ""
         )

{apexdevkit-1.17.16 → apexdevkit-1.17.17}/pyproject.toml

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