typeorm 0.3.22-dev.206af0a → 0.3.22-dev.673b6ce

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/driver/sqlserver/SqlServerQueryRunner.js CHANGED
@@ -80,7 +80,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
80
80
  ok();
81
81
  };
82
82
  if (this.transactionDepth === 0) {
83
- this.transactionDepth += 1;
84
83
  const pool = await (this.mode === "slave"
85
84
  ? this.driver.obtainSlaveConnection()
86
85
  : this.driver.obtainMasterConnection());
@@ -95,10 +94,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
95
94
  }
96
95
  }
97
96
  else {
98
- this.transactionDepth += 1;
99
- await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth - 1}`);
97
+ await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth}`);
100
98
  ok();
101
99
  }
100
+ this.transactionDepth += 1;
102
101
  });
103
102
  await this.broadcaster.broadcast("AfterTransactionStart");
104
103
  }
@@ -114,7 +113,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
114
113
  await this.broadcaster.broadcast("BeforeTransactionCommit");
115
114
  if (this.transactionDepth === 1) {
116
115
  return new Promise((ok, fail) => {
117
- this.transactionDepth -= 1;
118
116
  this.databaseConnection.commit(async (err) => {
119
117
  if (err)
120
118
  return fail(err);
@@ -123,6 +121,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
123
121
  await this.broadcaster.broadcast("AfterTransactionCommit");
124
122
  ok();
125
123
  this.connection.logger.logQuery("COMMIT");
124
+ this.transactionDepth -= 1;
126
125
  });
127
126
  });
128
127
  }
@@ -139,12 +138,11 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
139
138
  throw new TransactionNotStartedError_1.TransactionNotStartedError();
140
139
  await this.broadcaster.broadcast("BeforeTransactionRollback");
141
140
  if (this.transactionDepth > 1) {
141
+ await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth - 1}`);
142
142
  this.transactionDepth -= 1;
143
- await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth}`);
144
143
  }
145
144
  else {
146
145
  return new Promise((ok, fail) => {
147
- this.transactionDepth -= 1;
148
146
  this.databaseConnection.rollback(async (err) => {
149
147
  if (err)
150
148
  return fail(err);
@@ -153,6 +151,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
153
151
  await this.broadcaster.broadcast("AfterTransactionRollback");
154
152
  ok();
155
153
  this.connection.logger.logQuery("ROLLBACK");
154
+ this.transactionDepth -= 1;
156
155
  });
157
156
  });
158
157
  }