@entity-access/entity-access 1.0.307 → 1.0.309

package/src/model/EntitySource.ts

@@ -2,7 +2,7 @@ import type EntityContext from "./EntityContext.js";
 import type EntityType from "../entity-query/EntityType.js";
 import type { IBaseQuery, IEntityQuery, IFilterExpression } from "./IFilterWithParameter.js";
 import EntityQuery from "./EntityQuery.js";
-import { contextSymbol, modelSymbol } from "../common/symbols/symbols.js";
+import { contextSymbol, modelSymbol, traceSymbol } from "../common/symbols/symbols.js";
 import { Expression, ExpressionAs, Identifier, InsertStatement, TableLiteral } from "../query/ast/Expressions.js";
 import { DirectSaveType } from "../drivers/base/BaseDriver.js";
 import IdentityService from "./identity/IdentityService.js";
@@ -140,6 +140,12 @@ export class EntitySource<T = any> {
         if (!expression) {
             return changes as any;
         }
+        const tx = this.context.connection.currentTransaction;
+        let tid: string;
+        if (tx) {
+            tid = `txp_${Date.now()}`;
+            await tx.save(tid);
+        }
         try {
             const { text, values } = driver.compiler.compileExpression(null, expression);
             const r = await this.context.connection.executeQuery({ text, values });
@@ -156,6 +162,9 @@ export class EntitySource<T = any> {
             return returnEntity;
         } catch (error) {
             if (retry > 0) {
+                if (tid) {
+                    await tx.rollbackTo(tid);
+                }
                 await sleep(300);
                 return await this.saveDirect({ keys, mode, changes, updateAfterSelect } as any, retry -1);
             }
@@ -233,6 +242,7 @@ export class EntitySource<T = any> {
         selectStatement.model = model;
         return new EntityQuery<T>({
             context,
+            trace: context[traceSymbol],
             type: model,
             selectStatement
         }) as any as IEntityQuery<T>;

package/src/tests/db-tests/transaction-save-point/transaction-save-point.ts

@@ -0,0 +1,48 @@
+import assert from "assert";
+import { Sql } from "../../../index.js";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext } from "../../model/createContext.js";
+import { traceSymbol } from "../../../common/symbols/symbols.js";
+import { ShoppingContext } from "../../model/ShoppingContext.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    context[traceSymbol] = console.log;
+
+    await testSavePoint(context);
+
+    // SQL SERVER doesn't worry about failed transactions
+    // await failSavePoint(context);
+}
+
+async function testSavePoint(context: ShoppingContext) {
+    await using tx = await context.connection.createTransaction();
+    await tx.save("t1");
+
+    await assert.rejects(async () => {
+        const rx = await context.connection.executeQuery("SELECT ADSFDFDFDS FROM A1");
+        console.log(rx);
+    });
+
+    await tx.rollbackTo("t1");
+    const result = await context.connection.executeQuery("SELECT 1 as v1");
+    assert.strictEqual(1, result.rows[0].v1);
+}
+
+async function failSavePoint(context: ShoppingContext) {
+    await using tx = await context.connection.createTransaction();
+
+    await assert.rejects(async () => {
+        const rx = await context.connection.executeQuery("SELECT ADSFDFDFDS FROM A1");
+        console.log(rx);
+    });
+
+    await assert.rejects(async () => await context.connection.executeQuery("SELECT 1 as v1"));
+}
+