fix onconflict doupdate bug

lib/DboBuilder/TableHandler/DataValidator.ts

@@ -328,7 +328,7 @@ const convertionFuncs: ConvertionFunc[] = [
     getQuery: ({ args }) => `to_timestamp(${asValue(args[0])}::BIGINT/1000.0)::timestamp`
   }, {
     name: "merge",
-    description: "Merge the provided jsonb objects into the existing column value",
+    description: "Merge the provided jsonb objects into the existing column value, ensuring that a null source value will be coalesced with provided values",
     onlyAllowedFor: "update",
     getQuery: ({ args, column }) => {
       if (!args.length) throw "merge function requires at least one argument";

lib/DboBuilder/TableHandler/insert.ts

@@ -1,4 +1,4 @@
-import { AnyObject, InsertParams, isObject } from "prostgles-types";
+import { AnyObject, InsertParams, asName, isObject } from "prostgles-types";
 import { LocalParams, parseError, withUserRLS } from "../DboBuilder";
 import { TableRule, ValidateRowBasic } from "../../PublishParser/PublishParser";
 import { insertNestedRecords } from "../insertNestedRecords";
@@ -100,7 +100,7 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
         if(!pkeyNames.length) {
           throw "Cannot do DoUpdate on a table without a primary key";
         }
-        const nonPkeyCols = allowedCols.filter(c => !pkeyNames.includes(c));
+        const nonPkeyCols = allowedCols.filter(c => !pkeyNames.includes(c)).map(v => asName(v));
         if(!nonPkeyCols.length){
           throw "Cannot on conflict DoUpdate on a table with only primary key columns";
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.20",
+  "version": "4.2.21",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",