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/browser/driver/mysql/MysqlQueryRunner.js CHANGED
@@ -85,16 +85,15 @@ export class MysqlQueryRunner extends BaseQueryRunner {
85
85
  throw err;
86
86
  }
87
87
  if (this.transactionDepth === 0) {
88
- this.transactionDepth += 1;
89
88
  if (isolationLevel) {
90
89
  await this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
91
90
  }
92
91
  await this.query("START TRANSACTION");
93
92
  }
94
93
  else {
95
- this.transactionDepth += 1;
96
- await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
94
+ await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
97
95
  }
96
+ this.transactionDepth += 1;
98
97
  await this.broadcaster.broadcast("AfterTransactionStart");
99
98
  }
100
99
  /**
@@ -106,14 +105,13 @@ export class MysqlQueryRunner extends BaseQueryRunner {
106
105
  throw new TransactionNotStartedError();
107
106
  await this.broadcaster.broadcast("BeforeTransactionCommit");
108
107
  if (this.transactionDepth > 1) {
109
- this.transactionDepth -= 1;
110
- await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
108
+ await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
111
109
  }
112
110
  else {
113
- this.transactionDepth -= 1;
114
111
  await this.query("COMMIT");
115
112
  this.isTransactionActive = false;
116
113
  }
114
+ this.transactionDepth -= 1;
117
115
  await this.broadcaster.broadcast("AfterTransactionCommit");
118
116
  }
119
117
  /**
@@ -125,14 +123,13 @@ export class MysqlQueryRunner extends BaseQueryRunner {
125
123
  throw new TransactionNotStartedError();
126
124
  await this.broadcaster.broadcast("BeforeTransactionRollback");
127
125
  if (this.transactionDepth > 1) {
128
- this.transactionDepth -= 1;
129
- await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
126
+ await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
130
127
  }
131
128
  else {
132
- this.transactionDepth -= 1;
133
129
  await this.query("ROLLBACK");
134
130
  this.isTransactionActive = false;
135
131
  }
132
+ this.transactionDepth -= 1;
136
133
  await this.broadcaster.broadcast("AfterTransactionRollback");
137
134
  }
138
135
  /**