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/aurora-mysql/AuroraMysqlQueryRunner.js CHANGED
@@ -61,13 +61,12 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
61
61
  throw err;
62
62
  }
63
63
  if (this.transactionDepth === 0) {
64
- this.transactionDepth += 1;
65
64
  await this.client.startTransaction();
66
65
  }
67
66
  else {
68
- this.transactionDepth += 1;
69
- await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
67
+ await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
70
68
  }
69
+ this.transactionDepth += 1;
71
70
  await this.broadcaster.broadcast("AfterTransactionStart");
72
71
  }
73
72
  /**
@@ -79,14 +78,13 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
79
78
  throw new TransactionNotStartedError();
80
79
  await this.broadcaster.broadcast("BeforeTransactionCommit");
81
80
  if (this.transactionDepth > 1) {
82
- this.transactionDepth -= 1;
83
- await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
81
+ await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
84
82
  }
85
83
  else {
86
- this.transactionDepth -= 1;
87
84
  await this.client.commitTransaction();
88
85
  this.isTransactionActive = false;
89
86
  }
87
+ this.transactionDepth -= 1;
90
88
  await this.broadcaster.broadcast("AfterTransactionCommit");
91
89
  }
92
90
  /**
@@ -98,14 +96,13 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
98
96
  throw new TransactionNotStartedError();
99
97
  await this.broadcaster.broadcast("BeforeTransactionRollback");
100
98
  if (this.transactionDepth > 1) {
101
- this.transactionDepth -= 1;
102
- await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
99
+ await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
103
100
  }
104
101
  else {
105
- this.transactionDepth -= 1;
106
102
  await this.client.rollbackTransaction();
107
103
  this.isTransactionActive = false;
108
104
  }
105
+ this.transactionDepth -= 1;
109
106
  await this.broadcaster.broadcast("AfterTransactionRollback");
110
107
  }
111
108
  /**