code refactoring.

vitaly-t · Oct 2, 2016 · 5ed380e · 5ed380e
1 parent dc0fcf5
commit 5ed380e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/database.js b/lib/database.js
@@ -285,7 +285,7 @@ function Database(cn, dc, config) {
         return new $npm.context(cn, dc, config.options);
     }
 
-    function singleValue(value, cb, thisArg) {
+    function transform(value, cb, thisArg) {
         if (typeof cb === 'function') {
             value = value.then(function (data) {
                 return cb.call(thisArg, data);
@@ -395,7 +395,7 @@ function Database(cn, dc, config) {
          */
         obj.one = function (query, values, cb, thisArg) {
             var v = obj.query.call(this, query, values, $npm.result.one);
-            return singleValue(v, cb, thisArg);
+            return transform(v, cb, thisArg);
         };
 
         /**
@@ -489,7 +489,7 @@ function Database(cn, dc, config) {
          */
         obj.oneOrNone = function (query, values, cb, thisArg) {
             var v = obj.query.call(this, query, values, $npm.result.one | $npm.result.none);
-            return singleValue(v, cb, thisArg);
+            return transform(v, cb, thisArg);
         };
 
         /**
@@ -628,7 +628,7 @@ function Database(cn, dc, config) {
          */
         obj.result = function (query, values, cb, thisArg) {
             var v = obj.query.call(this, query, values, $npm.special.cache.resultQuery);
-            return singleValue(v, cb, thisArg);
+            return transform(v, cb, thisArg);
         };
 
         /**
@@ -722,7 +722,7 @@ function Database(cn, dc, config) {
          */
         obj.proc = function (procName, values, cb, thisArg) {
             var v = obj.func.call(this, procName, values, $npm.result.one | $npm.result.none);
-            return singleValue(v, cb, thisArg);
+            return transform(v, cb, thisArg);
         };
 
         /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "5.3.3",
+  "version": "5.3.4",
   "description": "Promises interface for PostgreSQL",
   "main": "lib/index.js",
   "scripts": {