fix: do not remove session tx id if txMeta empty.

Signed-off-by: Vladislav Polyakov <[email protected]>

Author: polRk

src/query/query-client.ts

@@ -10,7 +10,7 @@ import {
     sessionCurrentOperationSymbol,
     sessionReleaseSymbol, isIdempotentSymbol, isIdempotentDoLevelSymbol, ctxSymbol
 } from "./symbols";
-import {BadSession, SessionBusy} from "../errors";
+import {YdbError} from "../errors";
 import {Context} from "../context";
 import {ensureContext} from "../context";
 import {Logger} from "../logger/simple-logger";
@@ -71,8 +71,8 @@ export class QueryClient extends EventEmitter {
                         try {
                             res = await opts.fn(session);
                         } catch (err) {
-                            if (session[sessionTxIdSymbol] && !(err instanceof BadSession || err instanceof SessionBusy)) {
-                                await session[sessionRollbackTransactionSymbol]();
+                            if (err instanceof YdbError) {
+                                delete session[sessionTxIdSymbol];
                             }
                             throw err;
                         }

src/query/query-session-execute.ts

@@ -195,13 +195,13 @@ export function execute(this: QuerySession, args: IExecuteArgs): Promise<IExecut
         try {
             ensureCallSucceeded(partialResp);
         } catch (ydbErr) {
+            delete this[sessionTxIdSymbol]
+
             return cancel(ydbErr);
         }
 
         if (partialResp.txMeta?.id)
             this[sessionTxIdSymbol] = partialResp.txMeta!.id;
-        else
-            delete this[sessionTxIdSymbol];
 
         if (partialResp.resultSet) {
 
@@ -312,6 +312,10 @@ export function execute(this: QuerySession, args: IExecuteArgs): Promise<IExecut
             resultResolve = resultReject = undefined;
         }
 
+        if (args.txControl?.commitTx) {
+            delete this[sessionTxIdSymbol]
+        }
+
         if (finishedResolve) finishedResolve();
         delete this[sessionCurrentOperationSymbol];
         if (unsub) unsub();