Fix DB connect and generator for migrations

geddy · Nov 19, 2013 · 38028ae · 38028ae
1 parent fbb0a1c
commit 38028ae
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/gen/jakelib/env.jake b/gen/jakelib/env.jake
@@ -28,17 +28,29 @@ namespace('env', function () {
     });
   });
 
-  task('cleanup', function () {
+  task('cleanup', {async: true}, function () {
     // Disconnect all the adapters
     var adapters = geddy.model.loadedAdapters
-      , adapter;
-
-    for (var p in adapters) {
-      adapter = adapters[p];
-      if (typeof adapter.disconnect == 'function') {
-        adapter.disconnect();
-      }
-    }
+      , adapter
+      , keys = Object.keys(adapters)
+      , doIt = function () {
+          var key;
+          if ((key = keys.shift())) {
+            adapter = adapters[key];
+            // Try to disconnect nicely
+            if (typeof adapter.disconnect == 'function') {
+              // If there's a disconnect error, don't flip out about it
+              adapter.on('error', function () {});
+              adapter.disconnect(function () {
+                doIt();
+              });
+            }
+          }
+          else {
+            complete();
+          }
+        };
+    doIt();
   });
 
 });

diff --git a/gen/jakelib/migration.jake b/gen/jakelib/migration.jake
@@ -92,10 +92,10 @@ namespace('migration', function () {
         // Hook up the DB adapter
         // TODO: API for using a different adapter if using multiple
         // SQL adapters?
-        inst.adapter = geddy.model.loadedAdapters.Migration;
-        // Run it, up or down
+        Migration.call(inst, ctorName, geddy.model.loadedAdapters.Migration);
         inst[direction](function () {
           var m;
+          // Run it, up or down
           if (direction == 'up') {
             m = geddy.model.Migration.create({
               migration: migration