Merge pull request #117 from leapfrogtechnology/fix-transaction-issue

Throw an exception to rollback transaction if SQL migration fails
leapfrogtechnology · Mar 25, 2021 · fac47a2 · fac47a2
2 parents 1d3a739 + 6ff475e
commit fac47a2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/examples/node-mssql-programmatic-use/connections.sync-db.json.example b/examples/node-mssql-programmatic-use/connections.sync-db.json.example
@@ -4,11 +4,11 @@
       "id": "db1",
       "client": "mssql",
       "connection": {
-        "host": "localhost",
+        "host": "db",
         "port": 1433,
         "user": "sa",
         "database": "tempdb",
-        "password": "Password@123"
+        "password": "Secret@123"
       }
     }
   ]

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@leapfrogtechnology/sync-db",
   "description": "Command line utility to synchronize and version control relational database objects across databases",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.11",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -64,8 +64,8 @@
     "globby": "^10.0.2",
     "knex": "^0.20.11",
     "ramda": "^0.26.1",
-    "tslib": "^1",
     "ts-node": "^8",
+    "tslib": "^1",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {

diff --git a/src/migration/KnexMigrationSource.ts b/src/migration/KnexMigrationSource.ts
@@ -41,8 +41,6 @@ class KnexMigrationSource {
    * @returns {string}
    */
   getMigrationName(migration: string): string {
-    this.log('getMigrationName - resolve: ', migration);
-
     return migration;
   }
 

diff --git a/src/service/execution.ts b/src/service/execution.ts
@@ -59,7 +59,8 @@ export async function executeOperation<T extends OperationContext>(
 
     result.success = true;
   } catch (e) {
-    logDb(`Error caught for connection ${connectionId}:`, e);
+    logDb(`Error caught for connection ${connectionId}:`);
+
     result.error = e;
   }
 
@@ -74,5 +75,11 @@ export async function executeOperation<T extends OperationContext>(
     await context.params.onFailed(result);
   }
 
+  if (result.error) {
+    logDb('Result:\n%O', result);
+
+    throw { result };
+  }
+
   return result;
 }
diff --git a/src/util/promise.ts b/src/util/promise.ts
@@ -25,7 +25,11 @@ export async function runSequentially<T>(promisers: Promiser<T>[]): Promise<T[]>
 
       result.push(value);
     } catch (err) {
-      throw err;
+      if (!err.result) {
+        throw err;
+      }
+
+      result.push(err.result);
     }
   }