typeorm 0.3.22-dev.206af0a → 0.3.22-dev.513be33

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.
Files changed (37) hide show
  1. package/browser/driver/aurora-mysql/AuroraMysqlQueryRunner.js +6 -9
  2. package/browser/driver/aurora-mysql/AuroraMysqlQueryRunner.js.map +1 -1
  3. package/browser/driver/aurora-postgres/AuroraPostgresQueryRunner.js +6 -9
  4. package/browser/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map +1 -1
  5. package/browser/driver/cockroachdb/CockroachQueryRunner.js +7 -11
  6. package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  7. package/browser/driver/mysql/MysqlQueryRunner.js +6 -9
  8. package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
  9. package/browser/driver/oracle/OracleQueryRunner.js +4 -6
  10. package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
  11. package/browser/driver/postgres/PostgresQueryRunner.js +6 -9
  12. package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
  13. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +6 -9
  14. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  15. package/browser/driver/sqlserver/SqlServerQueryRunner.js +5 -6
  16. package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  17. package/browser/query-builder/RelationIdLoader.js +3 -2
  18. package/browser/query-builder/RelationIdLoader.js.map +1 -1
  19. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js +6 -9
  20. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js.map +1 -1
  21. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js +6 -9
  22. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map +1 -1
  23. package/driver/cockroachdb/CockroachQueryRunner.js +7 -11
  24. package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  25. package/driver/mysql/MysqlQueryRunner.js +6 -9
  26. package/driver/mysql/MysqlQueryRunner.js.map +1 -1
  27. package/driver/oracle/OracleQueryRunner.js +4 -6
  28. package/driver/oracle/OracleQueryRunner.js.map +1 -1
  29. package/driver/postgres/PostgresQueryRunner.js +6 -9
  30. package/driver/postgres/PostgresQueryRunner.js.map +1 -1
  31. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +6 -9
  32. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  33. package/driver/sqlserver/SqlServerQueryRunner.js +5 -6
  34. package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  35. package/package.json +1 -1
  36. package/query-builder/RelationIdLoader.js +3 -2
  37. package/query-builder/RelationIdLoader.js.map +1 -1
package/browser/driver/sqlserver/SqlServerQueryRunner.js CHANGED
@@ -77,7 +77,6 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
77
77
  ok();
78
78
  };
79
79
  if (this.transactionDepth === 0) {
80
- this.transactionDepth += 1;
81
80
  const pool = await (this.mode === "slave"
82
81
  ? this.driver.obtainSlaveConnection()
83
82
  : this.driver.obtainMasterConnection());
@@ -92,10 +91,10 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
92
91
  }
93
92
  }
94
93
  else {
95
- this.transactionDepth += 1;
96
- await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth - 1}`);
94
+ await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth}`);
97
95
  ok();
98
96
  }
97
+ this.transactionDepth += 1;
99
98
  });
100
99
  await this.broadcaster.broadcast("AfterTransactionStart");
101
100
  }
@@ -111,7 +110,6 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
111
110
  await this.broadcaster.broadcast("BeforeTransactionCommit");
112
111
  if (this.transactionDepth === 1) {
113
112
  return new Promise((ok, fail) => {
114
- this.transactionDepth -= 1;
115
113
  this.databaseConnection.commit(async (err) => {
116
114
  if (err)
117
115
  return fail(err);
@@ -120,6 +118,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
120
118
  await this.broadcaster.broadcast("AfterTransactionCommit");
121
119
  ok();
122
120
  this.connection.logger.logQuery("COMMIT");
121
+ this.transactionDepth -= 1;
123
122
  });
124
123
  });
125
124
  }
@@ -136,12 +135,11 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
136
135
  throw new TransactionNotStartedError();
137
136
  await this.broadcaster.broadcast("BeforeTransactionRollback");
138
137
  if (this.transactionDepth > 1) {
138
+ await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth - 1}`);
139
139
  this.transactionDepth -= 1;
140
- await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth}`);
141
140
  }
142
141
  else {
143
142
  return new Promise((ok, fail) => {
144
- this.transactionDepth -= 1;
145
143
  this.databaseConnection.rollback(async (err) => {
146
144
  if (err)
147
145
  return fail(err);
@@ -150,6 +148,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
150
148
  await this.broadcaster.broadcast("AfterTransactionRollback");
151
149
  ok();
152
150
  this.connection.logger.logQuery("ROLLBACK");
151
+ this.transactionDepth -= 1;
153
152
  });
154
153
  });
155
154
  }