Merge be90b78 into b03cd13

knex · Sep 2, 2014 · ef2c307 · ef2c307
2 parents b03cd13 + be90b78
commit ef2c307
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/dialects/sqlite3/schema/ddl.js b/lib/dialects/sqlite3/schema/ddl.js
@@ -35,13 +35,17 @@ SQLite3_DDL.prototype.ensureTransaction = Promise.method(function() {
 });
 
 SQLite3_DDL.prototype.commitTransaction = Promise.method(function() {
-  return this.runner.commitTransaction();
+  if (this.runner.transaction) {
+    return this.runner.commitTransaction();
+  }
 });
 
 SQLite3_DDL.prototype.rollbackTransaction = function(e) {
-  return this.runner.rollbackTransaction().then(function() {
-    throw e;
-  });
+  if (this.runner.transaction) {
+    return this.runner.rollbackTransaction().then(function() {
+      throw e;
+    });
+  }
 };
 
 SQLite3_DDL.prototype.getTableSql = function() {