typeorm 0.2.39-dev.0bc194c → 0.2.39-dev.dd94c9d
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.
- package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js +17 -46
- package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/browser/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js +17 -46
- package/browser/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js.map +1 -1
- package/browser/driver/cockroachdb/CockroachQueryRunner.js +44 -75
- package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/browser/driver/expo/ExpoQueryRunner.js +12 -43
- package/browser/driver/expo/ExpoQueryRunner.js.map +1 -1
- package/browser/driver/mysql/MysqlQueryRunner.js +22 -52
- package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/browser/driver/oracle/OracleQueryRunner.js +18 -46
- package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/browser/driver/postgres/PostgresQueryRunner.js +19 -49
- package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/browser/driver/sap/SapQueryRunner.js +18 -48
- package/browser/driver/sap/SapQueryRunner.js.map +1 -1
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +17 -47
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/browser/driver/sqlserver/SqlServerQueryRunner.js +74 -106
- package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/browser/entity-manager/MongoEntityManager.js +8 -13
- package/browser/entity-manager/MongoEntityManager.js.map +1 -1
- package/browser/query-builder/DeleteQueryBuilder.js +3 -10
- package/browser/query-builder/DeleteQueryBuilder.js.map +1 -1
- package/browser/query-builder/InsertQueryBuilder.js +2 -4
- package/browser/query-builder/InsertQueryBuilder.js.map +1 -1
- package/browser/query-builder/SelectQueryBuilder.js +2 -6
- package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
- package/browser/query-builder/SoftDeleteQueryBuilder.js +3 -10
- package/browser/query-builder/SoftDeleteQueryBuilder.js.map +1 -1
- package/browser/query-builder/UpdateQueryBuilder.js +3 -10
- package/browser/query-builder/UpdateQueryBuilder.js.map +1 -1
- package/browser/subscriber/Broadcaster.d.ts +23 -2
- package/browser/subscriber/Broadcaster.js +35 -2
- package/browser/subscriber/Broadcaster.js.map +1 -1
- package/browser/subscriber/BroadcasterResult.d.ts +4 -0
- package/browser/subscriber/BroadcasterResult.js +19 -0
- package/browser/subscriber/BroadcasterResult.js.map +1 -1
- package/cli.js +0 -5
- package/cli.js.map +1 -1
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js +17 -46
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js +17 -46
- package/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js.map +1 -1
- package/driver/cockroachdb/CockroachQueryRunner.js +44 -75
- package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/driver/expo/ExpoQueryRunner.js +12 -43
- package/driver/expo/ExpoQueryRunner.js.map +1 -1
- package/driver/mysql/MysqlQueryRunner.js +22 -52
- package/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/driver/oracle/OracleQueryRunner.js +18 -46
- package/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/driver/postgres/PostgresQueryRunner.js +19 -49
- package/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/driver/sap/SapQueryRunner.js +18 -48
- package/driver/sap/SapQueryRunner.js.map +1 -1
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +17 -47
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/driver/sqlserver/SqlServerQueryRunner.js +74 -106
- package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/entity-manager/MongoEntityManager.js +8 -13
- package/entity-manager/MongoEntityManager.js.map +1 -1
- package/package.json +1 -1
- package/query-builder/DeleteQueryBuilder.js +3 -10
- package/query-builder/DeleteQueryBuilder.js.map +1 -1
- package/query-builder/InsertQueryBuilder.js +2 -4
- package/query-builder/InsertQueryBuilder.js.map +1 -1
- package/query-builder/SelectQueryBuilder.js +2 -6
- package/query-builder/SelectQueryBuilder.js.map +1 -1
- package/query-builder/SoftDeleteQueryBuilder.js +3 -10
- package/query-builder/SoftDeleteQueryBuilder.js.map +1 -1
- package/query-builder/UpdateQueryBuilder.js +3 -10
- package/query-builder/UpdateQueryBuilder.js.map +1 -1
- package/subscriber/Broadcaster.d.ts +23 -2
- package/subscriber/Broadcaster.js +35 -2
- package/subscriber/Broadcaster.js.map +1 -1
- package/subscriber/BroadcasterResult.d.ts +4 -0
- package/subscriber/BroadcasterResult.js +19 -0
- package/subscriber/BroadcasterResult.js.map +1 -1
|
@@ -16,7 +16,6 @@ import { Broadcaster } from "../../subscriber/Broadcaster";
|
|
|
16
16
|
import { OrmUtils } from "../../util/OrmUtils";
|
|
17
17
|
import { Query } from "../Query";
|
|
18
18
|
import { MssqlParameter } from "./MssqlParameter";
|
|
19
|
-
import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
|
|
20
19
|
import { TypeORMError } from "../../error";
|
|
21
20
|
import { QueryLock } from "../../query-runner/QueryLock";
|
|
22
21
|
/**
|
|
@@ -62,7 +61,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
62
61
|
*/
|
|
63
62
|
SqlServerQueryRunner.prototype.startTransaction = function (isolationLevel) {
|
|
64
63
|
return __awaiter(this, void 0, void 0, function () {
|
|
65
|
-
var beforeBroadcastResult;
|
|
66
64
|
var _this = this;
|
|
67
65
|
return __generator(this, function (_a) {
|
|
68
66
|
switch (_a.label) {
|
|
@@ -71,52 +69,44 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
71
69
|
throw new QueryRunnerAlreadyReleasedError();
|
|
72
70
|
if (this.isTransactionActive)
|
|
73
71
|
throw new TransactionAlreadyStartedError();
|
|
74
|
-
|
|
75
|
-
this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
|
|
76
|
-
if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
|
|
77
|
-
return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
|
|
72
|
+
return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionStart')];
|
|
78
73
|
case 1:
|
|
79
74
|
_a.sent();
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
75
|
+
return [2 /*return*/, new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
|
|
76
|
+
var pool, transactionCallback;
|
|
77
|
+
var _this = this;
|
|
78
|
+
return __generator(this, function (_a) {
|
|
79
|
+
switch (_a.label) {
|
|
80
|
+
case 0:
|
|
81
|
+
this.isTransactionActive = true;
|
|
82
|
+
return [4 /*yield*/, (this.mode === "slave" ? this.driver.obtainSlaveConnection() : this.driver.obtainMasterConnection())];
|
|
83
|
+
case 1:
|
|
84
|
+
pool = _a.sent();
|
|
85
|
+
this.databaseConnection = pool.transaction();
|
|
86
|
+
transactionCallback = function (err) {
|
|
87
|
+
if (err) {
|
|
88
|
+
_this.isTransactionActive = false;
|
|
89
|
+
return fail(err);
|
|
90
|
+
}
|
|
91
|
+
ok();
|
|
92
|
+
_this.connection.logger.logQuery("BEGIN TRANSACTION");
|
|
93
|
+
if (isolationLevel) {
|
|
94
|
+
_this.connection.logger.logQuery("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
|
|
95
|
+
}
|
|
96
|
+
};
|
|
99
97
|
if (isolationLevel) {
|
|
100
|
-
|
|
98
|
+
this.databaseConnection.begin(this.convertIsolationLevel(isolationLevel), transactionCallback);
|
|
101
99
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
|
|
113
|
-
case 2:
|
|
114
|
-
_a.sent();
|
|
115
|
-
_a.label = 3;
|
|
116
|
-
case 3: return [2 /*return*/];
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
}); })];
|
|
100
|
+
else {
|
|
101
|
+
this.databaseConnection.begin(transactionCallback);
|
|
102
|
+
}
|
|
103
|
+
return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
|
|
104
|
+
case 2:
|
|
105
|
+
_a.sent();
|
|
106
|
+
return [2 /*return*/];
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}); })];
|
|
120
110
|
}
|
|
121
111
|
});
|
|
122
112
|
});
|
|
@@ -127,7 +117,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
127
117
|
*/
|
|
128
118
|
SqlServerQueryRunner.prototype.commitTransaction = function () {
|
|
129
119
|
return __awaiter(this, void 0, void 0, function () {
|
|
130
|
-
var beforeBroadcastResult;
|
|
131
120
|
var _this = this;
|
|
132
121
|
return __generator(this, function (_a) {
|
|
133
122
|
switch (_a.label) {
|
|
@@ -136,38 +125,28 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
136
125
|
throw new QueryRunnerAlreadyReleasedError();
|
|
137
126
|
if (!this.isTransactionActive)
|
|
138
127
|
throw new TransactionNotStartedError();
|
|
139
|
-
|
|
140
|
-
this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
|
|
141
|
-
if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
|
|
142
|
-
return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
|
|
128
|
+
return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionCommit')];
|
|
143
129
|
case 1:
|
|
144
130
|
_a.sent();
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
ok();
|
|
165
|
-
this.connection.logger.logQuery("COMMIT");
|
|
166
|
-
return [2 /*return*/];
|
|
167
|
-
}
|
|
168
|
-
});
|
|
169
|
-
}); });
|
|
170
|
-
})];
|
|
131
|
+
return [2 /*return*/, new Promise(function (ok, fail) {
|
|
132
|
+
_this.databaseConnection.commit(function (err) { return __awaiter(_this, void 0, void 0, function () {
|
|
133
|
+
return __generator(this, function (_a) {
|
|
134
|
+
switch (_a.label) {
|
|
135
|
+
case 0:
|
|
136
|
+
if (err)
|
|
137
|
+
return [2 /*return*/, fail(err)];
|
|
138
|
+
this.isTransactionActive = false;
|
|
139
|
+
this.databaseConnection = null;
|
|
140
|
+
return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
|
|
141
|
+
case 1:
|
|
142
|
+
_a.sent();
|
|
143
|
+
ok();
|
|
144
|
+
this.connection.logger.logQuery("COMMIT");
|
|
145
|
+
return [2 /*return*/];
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
}); });
|
|
149
|
+
})];
|
|
171
150
|
}
|
|
172
151
|
});
|
|
173
152
|
});
|
|
@@ -178,7 +157,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
178
157
|
*/
|
|
179
158
|
SqlServerQueryRunner.prototype.rollbackTransaction = function () {
|
|
180
159
|
return __awaiter(this, void 0, void 0, function () {
|
|
181
|
-
var beforeBroadcastResult;
|
|
182
160
|
var _this = this;
|
|
183
161
|
return __generator(this, function (_a) {
|
|
184
162
|
switch (_a.label) {
|
|
@@ -187,38 +165,28 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
|
|
|
187
165
|
throw new QueryRunnerAlreadyReleasedError();
|
|
188
166
|
if (!this.isTransactionActive)
|
|
189
167
|
throw new TransactionNotStartedError();
|
|
190
|
-
|
|
191
|
-
this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
|
|
192
|
-
if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
|
|
193
|
-
return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
|
|
168
|
+
return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionRollback')];
|
|
194
169
|
case 1:
|
|
195
170
|
_a.sent();
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
ok();
|
|
216
|
-
this.connection.logger.logQuery("ROLLBACK");
|
|
217
|
-
return [2 /*return*/];
|
|
218
|
-
}
|
|
219
|
-
});
|
|
220
|
-
}); });
|
|
221
|
-
})];
|
|
171
|
+
return [2 /*return*/, new Promise(function (ok, fail) {
|
|
172
|
+
_this.databaseConnection.rollback(function (err) { return __awaiter(_this, void 0, void 0, function () {
|
|
173
|
+
return __generator(this, function (_a) {
|
|
174
|
+
switch (_a.label) {
|
|
175
|
+
case 0:
|
|
176
|
+
if (err)
|
|
177
|
+
return [2 /*return*/, fail(err)];
|
|
178
|
+
this.isTransactionActive = false;
|
|
179
|
+
this.databaseConnection = null;
|
|
180
|
+
return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionRollback')];
|
|
181
|
+
case 1:
|
|
182
|
+
_a.sent();
|
|
183
|
+
ok();
|
|
184
|
+
this.connection.logger.logQuery("ROLLBACK");
|
|
185
|
+
return [2 /*return*/];
|
|
186
|
+
}
|
|
187
|
+
});
|
|
188
|
+
}); });
|
|
189
|
+
})];
|
|
222
190
|
}
|
|
223
191
|
});
|
|
224
192
|
});
|