fixing #272

lib/helpers/columnSet.js

@@ -160,7 +160,7 @@ function ColumnSet(columns, options) {
         throw new TypeError("Invalid parameter 'columns' specified.");
     }
 
-    var inherit, names, variables, castVariables, updates, cndCount = 0, isSimple = true;
+    var inherit, names, variables, updates, cndCount = 0, isSimple = true;
 
     if (!$npm.utils.isNull(options)) {
         if (typeof options !== 'object') {
@@ -260,35 +260,17 @@ function ColumnSet(columns, options) {
      * @type String
      * @readonly
      * @description
-     * A string that contains a comma-separated list of all variables.
+     * Generates a formatting template - a string that contains
+     * a comma-separated list of all variables with casting.
      */
     Object.defineProperty(this, 'variables', {
         get: function () {
             if (!variables) {
                 variables = $arr.map(this.columns, function (c) {
-                    return c.variable;
-                }).join();
-            }
-            return variables;
-        }
-    });
-
-    /**
-     * @name helpers.ColumnSet#castVariables
-     * @private
-     * @type String
-     * @readonly
-     * @description
-     * A string that contains a comma-separated list of all variables with casting.
-     */
-    Object.defineProperty(this, 'castVariables', {
-        get: function () {
-            if (!castVariables) {
-                castVariables = $arr.map(this.columns, function (c) {
                     return c.variable + c.castText;
                 }).join();
             }
-            return castVariables;
+            return variables;
         }
     });
 

lib/helpers/methods/insert.js

@@ -127,10 +127,10 @@ function insert(data, columns, table, capSQL) {
                 if (!d || typeof d !== 'object') {
                     throw new Error("Invalid insert object at index " + index + ".");
                 }
-                return '(' + format(columns.castVariables, columns.prepare(d)) + ')';
+                return '(' + format(columns.variables, columns.prepare(d)) + ')';
             }).join();
     }
-    return query + '(' + format(columns.castVariables, columns.prepare(data)) + ')';
+    return query + '(' + format(columns.variables, columns.prepare(data)) + ')';
 }
 
 var sql = {

lib/helpers/methods/update.js

@@ -159,7 +159,7 @@ function update(data, columns, table, options, capSQL) {
         checkTable();
 
         var targetCols = $arr.map(actualColumns, function (c) {
-            return c.escapedName + '=' + valueAlias + '.' + c.escapedName + c.castText;
+            return c.escapedName + '=' + valueAlias + '.' + c.escapedName;
         }).join();
 
         var values = $arr.map(data, function (d, index) {

lib/helpers/methods/values.js

@@ -99,10 +99,10 @@ function values(data, columns) {
             if (!d || typeof d !== 'object') {
                 throw new Error("Invalid object at index " + index + ".");
             }
-            return '(' + format(columns.castVariables, columns.prepare(d)) + ')';
+            return '(' + format(columns.variables, columns.prepare(d)) + ')';
         }).join();
     }
-    return '(' + format(columns.castVariables, columns.prepare(data)) + ')';
+    return '(' + format(columns.variables, columns.prepare(data)) + ')';
 }
 
 module.exports = values;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "5.5.2",
+  "version": "5.5.3",
   "description": "Promises interface for PostgreSQL",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",

test/helpSpec.js

@@ -128,7 +128,7 @@ describe("UPDATE", function () {
                 expect(helpers.update(dataMulti, ['?id', 'val', {
                     name: 'msg',
                     cast: 'text'
-                }], 'table')).toBe('update "table" as t set "val"=v."val","msg"=v."msg"::text from (values(1,123,\'hello\'),(2,456,\'world\')) as v("id","val","msg")');
+                }], 'table')).toBe('update "table" as t set "val"=v."val","msg"=v."msg" from (values(1,123,\'hello\'::text),(2,456,\'world\'::text)) as v("id","val","msg")');
             });
         });
     });