code refactoring.

lib/async.js

@@ -5,17 +5,13 @@
 //
 // Based on: https://www.promisejs.org/generators/#both
 function asyncAdapter(generator) {
-
-    var func = function () {
-
+    return function () {
         var g = generator.apply(this, arguments);
 
         function handle(result) {
-
             if (result.done) {
                 return $p.resolve(result.value);
             }
-
             return $p.resolve(result.value)
                 .then(function (res) {
                     return handle(g.next(res));
@@ -29,18 +25,7 @@ function asyncAdapter(generator) {
         } catch (ex) {
             return $p.reject(ex);
         }
-    };
-
-    // re-applying the tagging logic;
-    if (generator.tag === undefined) {
-        if (generator.name) {
-            func.tag = generator.name;
-        }
-    } else {
-        func.tag = generator.tag;
     }
-
-    return func;
 }
 
 var $p;

lib/index.js

@@ -417,10 +417,6 @@ function $extend(ctx, obj) {
             return $p.reject("Callback function is required for the " + (isTX ? "transaction." : "task."));
         }
 
-        if (taskCtx.cb.constructor.name === 'GeneratorFunction') {
-            taskCtx.cb = $npm.async(taskCtx.cb);
-        }
-
         if (tag === undefined) {
             if (taskCtx.cb.tag !== undefined) {
                 // use the default tag associated with the task:
@@ -432,6 +428,10 @@ function $extend(ctx, obj) {
             }
         }
 
+        if (taskCtx.cb.constructor.name === 'GeneratorFunction') {
+            taskCtx.cb = $npm.async(taskCtx.cb);
+        }
+
         var tsk = new Task(taskCtx, tag, isTX);
 
         if (taskCtx.db) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "PostgreSQL via promises",
   "main": "lib/index.js",
   "scripts": {