@vendure/core 3.6.4-master-202605200308 → 3.6.4-master-202605220308
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -25,10 +25,10 @@ class TransactionWrapper {
|
|
|
25
25
|
// Copy to make sure original context will remain valid after transaction completes
|
|
26
26
|
const ctx = originalCtx.copy();
|
|
27
27
|
const entityManager = ctx[constants_1.TRANSACTION_MANAGER_KEY];
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
const inheritedQueryRunner = (entityManager === null || entityManager === void 0 ? void 0 : entityManager.queryRunner) && !entityManager.queryRunner.isReleased
|
|
29
|
+
? entityManager.queryRunner
|
|
30
|
+
: undefined;
|
|
31
|
+
const queryRunner = inheritedQueryRunner !== null && inheritedQueryRunner !== void 0 ? inheritedQueryRunner : connection.createQueryRunner();
|
|
32
32
|
if (mode === 'auto') {
|
|
33
33
|
await this.startTransaction(queryRunner, isolationLevel);
|
|
34
34
|
}
|
|
@@ -52,9 +52,13 @@ class TransactionWrapper {
|
|
|
52
52
|
throw error;
|
|
53
53
|
}
|
|
54
54
|
finally {
|
|
55
|
-
if
|
|
56
|
-
|
|
57
|
-
|
|
55
|
+
// Only release the QueryRunner if we created it ourselves. If it was inherited
|
|
56
|
+
// from an outer transaction (e.g. a @Transaction('manual') caller), releasing it
|
|
57
|
+
// would invalidate the caller's context. The active-transaction check additionally
|
|
58
|
+
// covers the nested-savepoint case where the parent transaction is still open.
|
|
59
|
+
if (!inheritedQueryRunner &&
|
|
60
|
+
!queryRunner.isTransactionActive &&
|
|
61
|
+
queryRunner.isReleased === false) {
|
|
58
62
|
await queryRunner.release();
|
|
59
63
|
}
|
|
60
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-wrapper.js","sourceRoot":"","sources":["../../src/connection/transaction-wrapper.ts"],"names":[],"mappings":";;;AAAA,+BAAuD;AACvD,8CAAsD;AAEtD,iGAA8F;AAI9F,mDAA8D;AAE9D;;;;GAIG;AACH,MAAa,kBAAkB;IAC3B;;;;;;;;;OASG;IACH,KAAK,CAAC,oBAAoB,CACtB,WAA2B,EAC3B,IAAyD,EACzD,IAAqB,EACrB,cAAqD,EACrD,UAAsB;QAEtB,mFAAmF;QACnF,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAE/B,MAAM,aAAa,GAA+B,GAAW,CAAC,mCAAuB,CAAC,CAAC;QACvF,
|
|
1
|
+
{"version":3,"file":"transaction-wrapper.js","sourceRoot":"","sources":["../../src/connection/transaction-wrapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "3.6.4-master-
|
|
3
|
+
"version": "3.6.4-master-202605220308",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@nestjs/platform-express": "^11.0.12",
|
|
50
50
|
"@nestjs/terminus": "^11.0.0",
|
|
51
51
|
"@nestjs/typeorm": "^11.0.0",
|
|
52
|
-
"@vendure/common": "^3.6.4-master-
|
|
52
|
+
"@vendure/common": "^3.6.4-master-202605220308",
|
|
53
53
|
"bcrypt": "^6.0.0",
|
|
54
54
|
"body-parser": "^1.20.2",
|
|
55
55
|
"cookie-session": "^2.1.0",
|