typeorm 0.3.22-dev.206af0a → 0.3.22-dev.40cc688

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 (39) 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/commands/InitCommand.js +8 -16
  20. package/commands/InitCommand.js.map +1 -1
  21. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js +6 -9
  22. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js.map +1 -1
  23. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js +6 -9
  24. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map +1 -1
  25. package/driver/cockroachdb/CockroachQueryRunner.js +7 -11
  26. package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  27. package/driver/mysql/MysqlQueryRunner.js +6 -9
  28. package/driver/mysql/MysqlQueryRunner.js.map +1 -1
  29. package/driver/oracle/OracleQueryRunner.js +4 -6
  30. package/driver/oracle/OracleQueryRunner.js.map +1 -1
  31. package/driver/postgres/PostgresQueryRunner.js +6 -9
  32. package/driver/postgres/PostgresQueryRunner.js.map +1 -1
  33. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +6 -9
  34. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  35. package/driver/sqlserver/SqlServerQueryRunner.js +5 -6
  36. package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  37. package/package.json +1 -1
  38. package/query-builder/RelationIdLoader.js +3 -2
  39. package/query-builder/RelationIdLoader.js.map +1 -1
package/driver/mysql/MysqlQueryRunner.js CHANGED
@@ -88,16 +88,15 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
88
88
  throw err;
89
89
  }
90
90
  if (this.transactionDepth === 0) {
91
- this.transactionDepth += 1;
92
91
  if (isolationLevel) {
93
92
  await this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
94
93
  }
95
94
  await this.query("START TRANSACTION");
96
95
  }
97
96
  else {
98
- this.transactionDepth += 1;
99
- await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
97
+ await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
100
98
  }
99
+ this.transactionDepth += 1;
101
100
  await this.broadcaster.broadcast("AfterTransactionStart");
102
101
  }
103
102
  /**
@@ -109,14 +108,13 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
109
108
  throw new TransactionNotStartedError_1.TransactionNotStartedError();
110
109
  await this.broadcaster.broadcast("BeforeTransactionCommit");
111
110
  if (this.transactionDepth > 1) {
112
- this.transactionDepth -= 1;
113
- await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
111
+ await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
114
112
  }
115
113
  else {
116
- this.transactionDepth -= 1;
117
114
  await this.query("COMMIT");
118
115
  this.isTransactionActive = false;
119
116
  }
117
+ this.transactionDepth -= 1;
120
118
  await this.broadcaster.broadcast("AfterTransactionCommit");
121
119
  }
122
120
  /**
@@ -128,14 +126,13 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
128
126
  throw new TransactionNotStartedError_1.TransactionNotStartedError();
129
127
  await this.broadcaster.broadcast("BeforeTransactionRollback");
130
128
  if (this.transactionDepth > 1) {
131
- this.transactionDepth -= 1;
132
- await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
129
+ await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
133
130
  }
134
131
  else {
135
- this.transactionDepth -= 1;
136
132
  await this.query("ROLLBACK");
137
133
  this.isTransactionActive = false;
138
134
  }
135
+ this.transactionDepth -= 1;
139
136
  await this.broadcaster.broadcast("AfterTransactionRollback");
140
137
  }
141
138
  /**