typeorm 0.3.21 → 0.3.22-dev.04ca83a

package/driver/sqlserver/SqlServerQueryRunner.js

@@ -80,7 +80,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 ok();
             };
             if (this.transactionDepth === 0) {
-                this.transactionDepth += 1;
                 const pool = await (this.mode === "slave"
                     ? this.driver.obtainSlaveConnection()
                     : this.driver.obtainMasterConnection());
@@ -95,10 +94,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 }
             }
             else {
-                this.transactionDepth += 1;
-                await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth - 1}`);
+                await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth}`);
                 ok();
             }
+            this.transactionDepth += 1;
         });
         await this.broadcaster.broadcast("AfterTransactionStart");
     }
@@ -114,7 +113,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         if (this.transactionDepth === 1) {
             return new Promise((ok, fail) => {
-                this.transactionDepth -= 1;
                 this.databaseConnection.commit(async (err) => {
                     if (err)
                         return fail(err);
@@ -123,6 +121,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     await this.broadcaster.broadcast("AfterTransactionCommit");
                     ok();
                     this.connection.logger.logQuery("COMMIT");
+                    this.transactionDepth -= 1;
                 });
             });
         }
@@ -139,12 +138,11 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         if (this.transactionDepth > 1) {
+            await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth - 1}`);
             this.transactionDepth -= 1;
-            await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth}`);
         }
         else {
             return new Promise((ok, fail) => {
-                this.transactionDepth -= 1;
                 this.databaseConnection.rollback(async (err) => {
                     if (err)
                         return fail(err);
@@ -153,6 +151,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     await this.broadcaster.broadcast("AfterTransactionRollback");
                     ok();
                     this.connection.logger.logQuery("ROLLBACK");
+                    this.transactionDepth -= 1;
                 });
             });
         }
@@ -1499,14 +1498,14 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         return `("fk"."referenced_object_id" = OBJECT_ID('"${TABLE_CATALOG}"."${TABLE_SCHEMA}"."${TABLE_NAME}"'))`;
                     })
                         .join(" OR ");
-                    return `
-                        SELECT DISTINCT '${TABLE_CATALOG}' AS                                              "TABLE_CATALOG",
-                                        OBJECT_SCHEMA_NAME("fk"."parent_object_id",
-                                                           DB_ID('${TABLE_CATALOG}')) AS                   "TABLE_SCHEMA",
-                                        OBJECT_NAME("fk"."parent_object_id", DB_ID('${TABLE_CATALOG}')) AS "TABLE_NAME",
-                                        "fk"."name" AS                                                     "CONSTRAINT_NAME"
-                        FROM "${TABLE_CATALOG}"."sys"."foreign_keys" AS "fk"
-                        WHERE (${conditions})
+                    return `
+                        SELECT DISTINCT '${TABLE_CATALOG}' AS                                              "TABLE_CATALOG",
+                                        OBJECT_SCHEMA_NAME("fk"."parent_object_id",
+                                                           DB_ID('${TABLE_CATALOG}')) AS                   "TABLE_SCHEMA",
+                                        OBJECT_NAME("fk"."parent_object_id", DB_ID('${TABLE_CATALOG}')) AS "TABLE_NAME",
+                                        "fk"."name" AS                                                     "CONSTRAINT_NAME"
+                        FROM "${TABLE_CATALOG}"."sys"."foreign_keys" AS "fk"
+                        WHERE (${conditions})
                     `;
                 })
                     .join(" UNION ALL ");
@@ -1609,16 +1608,16 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const dbDatabases = await this.query(databasesSql);
             const tablesSql = dbDatabases
                 .map(({ name }) => {
-                return `
-                    SELECT DISTINCT
-                        "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"
-                    FROM "${name}"."INFORMATION_SCHEMA"."TABLES"
-                    WHERE
-                      "TABLE_TYPE" = 'BASE TABLE'
-                      AND
-                      "TABLE_CATALOG" = '${name}'
-                      AND
-                      ISNULL(Objectproperty(Object_id("TABLE_CATALOG" + '.' + "TABLE_SCHEMA" + '.' + "TABLE_NAME"), 'IsMSShipped'), 0) = 0
+                return `
+                    SELECT DISTINCT
+                        "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"
+                    FROM "${name}"."INFORMATION_SCHEMA"."TABLES"
+                    WHERE
+                      "TABLE_TYPE" = 'BASE TABLE'
+                      AND
+                      "TABLE_CATALOG" = '${name}'
+                      AND
+                      ISNULL(Objectproperty(Object_id("TABLE_CATALOG" + '.' + "TABLE_SCHEMA" + '.' + "TABLE_NAME"), 'IsMSShipped'), 0) = 0
                 `;
             })
                 .join(" UNION ALL ");
@@ -1643,14 +1642,14 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     return `("TABLE_SCHEMA" = '${schema}' AND "TABLE_NAME" = '${tableName}')`;
                 })
                     .join(" OR ");
-                return `
-                    SELECT DISTINCT
-                        "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"
-                    FROM "${database}"."INFORMATION_SCHEMA"."TABLES"
-                    WHERE
-                          "TABLE_TYPE" = 'BASE TABLE' AND
-                          "TABLE_CATALOG" = '${database}' AND
-                          ${tablesCondition}
+                return `
+                    SELECT DISTINCT
+                        "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"
+                    FROM "${database}"."INFORMATION_SCHEMA"."TABLES"
+                    WHERE
+                          "TABLE_TYPE" = 'BASE TABLE' AND
+                          "TABLE_CATALOG" = '${database}' AND
+                          ${tablesCondition}
                 `;
             })
                 .join(" UNION ALL ");